Merge into trunk : bump-uservice : Code : core-image-watcher

Status:	Merged
Approved by:	Celso Providelo on 2015-04-03
Approved revision:	17
Merged at revision:	15
Proposed branch:	lp://staging/~cprov/core-image-watcher/bump-uservice
Merge into:	lp://staging/core-image-watcher
Diff against target:	21 lines (+3/-1) 2 files modified core_image_watcher/__init__.py (+2/-0) requirements.txt (+1/-1)
To merge this branch:	bzr merge lp://staging/~cprov/core-image-watcher/bump-uservice
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Celso Providelo (community)			Approve on 2015-04-03
Review via email: mp+255161@code.staging.launchpad.net

Commit message

Upgrading uservices-utils dependency to 1.0.2.1 to benefit of working logstash support.

Description of the change

Upgrading uservices-utils dependency to 1.0.2.1 to benefit of working logstash support.

Also ensure the service logs a watermarked message on start ('Started!') so we can monitor if it is dying unexpectedly.

Project pip-cache already include the new package version.

Revision history for this message

Celso Providelo (cprov) on 2015-04-03:

#

review: Approve

Revision history for this message

Ubuntu CI Bot (uci-bot) wrote on 2015-04-03:

#

Download full text (7.4 KiB)

The attempt to merge lp:~cprov/core-image-watcher/bump-uservice into lp:core-image-watcher failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-core-image-watcherdkd9ek2u/bin/python3
Also creating executable in /tmp/venv-core-image-watcherdkd9ek2u/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 1))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 2))
Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking uservice-utils==1.0.2.1 (from -r requirements.txt (line 3))
Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/anyjson/setup.py) egg_info for package anyjson

Installing collected packages: kombu, python-logstash, uservice-utils, amqp, anyjson
Running setup.py install for python-logstash

Running setup.py install for amqp

  Running setup.py install for anyjson
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma

Successfully installed kombu python-logstash uservice-utils amqp anyjson
Cleaning up...
Downloading/unpacking testtools==1.7.1 (from -r test_requirements.txt (line 1))
Downloading/unpacking flake8==2.4.0 (from -r test_requirements.txt (line 2))
  Downloading flake8-2.4.0-py2.py3-none-any.whl
Downloading/unpacking unittest2>=1.0.0 (from testtools==1.7.1->-r test_requirements.txt (line 1))
Downloading/unpacking traceback2 (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading traceback2-1.4.0-py2.py3-none-any.whl
Downloading/unpacking extras (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading extras-0.0.3.tar.gz
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/extras/setup.py) egg_info for package extras

Downloading/unpacking python-mimeparse (from testtools==1.7.1->-r test_requirements.txt (line 1))
Downloading python-mimeparse-0.1.4.tar.gz
Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/python-mimeparse/setup.py) egg_info for package python-mimeparse

Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.0->-r test_requirements.txt (line 2))
Downloading pyflakes-0.8.1-py2.py3-none-any.whl
Downloading/unpacking pep8>=1.5.7,<1.6 (from flake8==2.4.0->-r test_requirements.txt (line 2))
Downloading pep8-1.5.7-py2.py3-none-any.whl
Downloadin...

The attempt to merge lp:~cprov/core-image-watcher/bump-uservice into lp:core-image-watcher failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-core-image-watcherdkd9ek2u/bin/python3
Also creating executable in /tmp/venv-core-image-watcherdkd9ek2u/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python3
Ignoring indexes: https://pypi.python.org/simple/
Downloading/unpacking kombu==3.0.24 (from -r requirements.txt (line 1))
Downloading/unpacking python-logstash==0.4.2 (from -r requirements.txt (line 2))
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/python-logstash/setup.py) egg_info for package python-logstash
    
Downloading/unpacking uservice-utils==1.0.2.1 (from -r requirements.txt (line 3))
Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/amqp/setup.py) egg_info for package amqp
    
Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/anyjson/setup.py) egg_info for package anyjson
    
Installing collected packages: kombu, python-logstash, uservice-utils, amqp, anyjson
  Running setup.py install for python-logstash
    
  Running setup.py install for amqp
    
  Running setup.py install for anyjson
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma
    Fixing build/lib/anyjson/__init__.py
    Skipping implicit fixer: buffer
    Skipping implicit fixer: idioms
    Skipping implicit fixer: set_literal
    Skipping implicit fixer: ws_comma
    
Successfully installed kombu python-logstash uservice-utils amqp anyjson
Cleaning up...
Downloading/unpacking testtools==1.7.1 (from -r test_requirements.txt (line 1))
Downloading/unpacking flake8==2.4.0 (from -r test_requirements.txt (line 2))
  Downloading flake8-2.4.0-py2.py3-none-any.whl
Downloading/unpacking unittest2>=1.0.0 (from testtools==1.7.1->-r test_requirements.txt (line 1))
Downloading/unpacking traceback2 (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading traceback2-1.4.0-py2.py3-none-any.whl
Downloading/unpacking extras (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading extras-0.0.3.tar.gz
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/extras/setup.py) egg_info for package extras
    
Downloading/unpacking python-mimeparse (from testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading python-mimeparse-0.1.4.tar.gz
  Running setup.py (path:/tmp/venv-core-image-watcherdkd9ek2u/build/python-mimeparse/setup.py) egg_info for package python-mimeparse
    
Downloading/unpacking pyflakes>=0.8.1,<0.9 (from flake8==2.4.0->-r test_requirements.txt (line 2))
  Downloading pyflakes-0.8.1-py2.py3-none-any.whl
Downloading/unpacking pep8>=1.5.7,<1.6 (from flake8==2.4.0->-r test_requirements.txt (line 2))
  Downloading pep8-1.5.7-py2.py3-none-any.whl
Downloading/unpacking mccabe>=0.2.1,<0.4 (from flake8==2.4.0->-r test_requirements.txt (line 2))
  Downloading mccabe-0.3-py2.py3-none-any.whl
Downloading/unpacking six>=1.4 (from unittest2>=1.0.0->testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading six-1.9.0-py2.py3-none-any.whl
Downloading/unpacking argparse (from unittest2>=1.0.0->testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading argparse-1.3.0-py2.py3-none-any.whl
Downloading/unpacking linecache2 (from traceback2->testtools==1.7.1->-r test_requirements.txt (line 1))
  Downloading linecache2-1.0.0-py2.py3-none-any.whl
Installing collected packages: testtools, flake8, unittest2, traceback2, extras, python-mimeparse, pyflakes, pep8, mccabe, six, argparse, linecache2
*** Error compiling '/tmp/venv-core-image-watcherdkd9ek2u/build/testtools/testtools/_compat2x.py'...
  File "/tmp/venv-core-image-watcherdkd9ek2u/build/testtools/testtools/_compat2x.py", line 16
    raise exc_class, exc_obj, exc_tb
                   ^
SyntaxError: invalid syntax

Running setup.py install for extras
    
  Running setup.py install for python-mimeparse
    
Successfully installed testtools flake8 unittest2 traceback2 extras python-mimeparse pyflakes pep8 mccabe six argparse linecache2
Cleaning up...
running test
running egg_info
creating core_image_watcher.egg-info
writing core_image_watcher.egg-info/PKG-INFO
writing top-level names to core_image_watcher.egg-info/top_level.txt
writing dependency_links to core_image_watcher.egg-info/dependency_links.txt
writing manifest file 'core_image_watcher.egg-info/SOURCES.txt'
reading manifest file 'core_image_watcher.egg-info/SOURCES.txt'
writing manifest file 'core_image_watcher.egg-info/SOURCES.txt'
running build_ext
running flake8
core_image_watcher/__init__.py:153:29: F821 undefined name 'body'
INFO: Executing: bzr branch lp:~canonical-ci-engineering/core-image-watcher/pip-cache /tmp/tmpdpbvpw85pip-cache-/cache
INFO: Executing: virtualenv -p python3 /tmp/venv-core-image-watcherdkd9ek2u
INFO: Executing: /tmp/venv-core-image-watcherdkd9ek2u/bin/pip install --no-index --find-links=/tmp/tmpdpbvpw85pip-cache-/cache -r requirements.txt
INFO: Executing: /tmp/venv-core-image-watcherdkd9ek2u/bin/pip install -r test_requirements.txt
INFO: Executing: /tmp/venv-core-image-watcherdkd9ek2u/bin/python3 setup.py test
INFO: Executing: /tmp/venv-core-image-watcherdkd9ek2u/bin/python3 setup.py flake8
ERROR: Calling `['/tmp/venv-core-image-watcherdkd9ek2u/bin/python3', 'setup.py', 'flake8']` failed (with code 1)

Branched 6 revisions.
test_cache_version_to_disk (core_image_watcher.tests.test_image_watcher.TestWatchImage)
core_image_watcher.tests.test_image_watcher.TestWatchImage.test_cache_version_to_disk ... ok
test_cache_version_with_different_digits_to_disk (core_image_watcher.tests.test_image_watcher.TestWatchImage)
core_image_watcher.tests.test_image_watcher.TestWatchImage.test_cache_version_with_different_digits_to_disk ... ok
test_check_for_new_image (core_image_watcher.tests.test_image_watcher.TestWatchImage)
core_image_watcher.tests.test_image_watcher.TestWatchImage.test_check_for_new_image ... ok
test_check_for_no_new_image (core_image_watcher.tests.test_image_watcher.TestWatchImage)
core_image_watcher.tests.test_image_watcher.TestWatchImage.test_check_for_no_new_image ... ok
test_do_not_cache_the_same_version_to_disk (core_image_watcher.tests.test_image_watcher.TestWatchImage)
core_image_watcher.tests.test_image_watcher.TestWatchImage.test_do_not_cache_the_same_version_to_disk ... ok
test_do_not_proceed (core_image_watcher.tests.test_image_watcher.TestWatchImage)
core_image_watcher.tests.test_image_watcher.TestWatchImage.test_do_not_proceed ... ok
test_dont_get_latest_version (core_image_watcher.tests.test_image_watcher.TestWatchImage)
core_image_watcher.tests.test_image_watcher.TestWatchImage.test_dont_get_latest_version ... ok
test_freshly_cache_version_to_disk (core_image_watcher.tests.test_image_watcher.TestWatchImage)
core_image_watcher.tests.test_image_watcher.TestWatchImage.test_freshly_cache_version_to_disk ... ok
test_get_latest_version (core_image_watcher.tests.test_image_watcher.TestWatchImage)
core_image_watcher.tests.test_image_watcher.TestWatchImage.test_get_latest_version ... ok

----------------------------------------------------------------------
Ran 9 tests in 0.004s

OK

lp://staging/~cprov/core-image-watcher/bump-uservice updated on 2015-04-03

17. By Celso Providelo on 2015-04-03: Fix testing issue.

core-image-watcher

Merge lp://staging/~cprov/core-image-watcher/bump-uservice into lp://staging/core-image-watcher

Commit message

Description of the change

Preview Diff

Subscribers