Merge lp://staging/~psivaa/snappy-proposed-image-tester/subst-and-rename into lp://staging/snappy-proposed-image-tester

Proposed by Para Siva
Status: Superseded
Proposed branch: lp://staging/~psivaa/snappy-proposed-image-tester/subst-and-rename
Merge into: lp://staging/snappy-proposed-image-tester
Diff against target: 273 lines (+34/-34)
12 files modified
README.rst (+5/-5)
called-by-tarmac.py (+2/-2)
setup.py (+5/-5)
snappy-proposed-image-tester.py (+1/-1)
snappy_proposed_image_tester/__init__.py (+7/-7)
snappy_proposed_image_tester/cloud.py (+1/-1)
snappy_proposed_image_tester/constants.py (+2/-2)
snappy_proposed_image_tester/queue.py (+2/-2)
snappy_proposed_image_tester/tests/__init__.py (+1/-1)
snappy_proposed_image_tester/tests/test_queue_integration.py (+3/-3)
snappy_proposed_image_tester/utils.py (+1/-1)
snappy_proposed_image_tester/worker.py (+4/-4)
To merge this branch: bzr merge lp://staging/~psivaa/snappy-proposed-image-tester/subst-and-rename
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Paul Larson Approve
Review via email: mp+260362@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-05-27.

Commit message

Renaming and substituting the module names to match the branch name and the charm requirements.

Description of the change

Renaming and substituting the module names to match the branch name and the charm requirements. This might be more than actually needed but just wanted to be safe.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

One minor thing in the readme, otherwise +1

review: Approve
Revision history for this message
Francis Ginther (fginther) wrote :

Approved, yo!

review: Approve
Revision history for this message
Ubuntu CI Bot (uci-bot) wrote :
Download full text (25.7 KiB)

The attempt to merge lp:~psivaa/snappy-proposed-image-tester/subst-and-rename into lp:snappy-proposed-image-tester failed. Below is the output from the failed tests.

Using base prefix '/usr'
New python executable in /tmp/venv-snappy-proposed-image-testervpue635y/bin/python3
Also creating executable in /tmp/venv-snappy-proposed-image-testervpue635y/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-snappy-proposed-image-testervpue635y/build/python-logstash/setup.py) egg_info for package python-logstash

Downloading/unpacking python-swiftclient==2.4.0 (from -r requirements.txt (line 3))
Downloading/unpacking python-keystoneclient==1.3.0 (from -r requirements.txt (line 4))
Downloading/unpacking uservice-utils==1.0.2.1 (from -r requirements.txt (line 5))
Downloading/unpacking anyjson>=0.3.3 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/anyjson/setup.py) egg_info for package anyjson

Downloading/unpacking amqp>=1.4.5,<2.0 (from kombu==3.0.24->-r requirements.txt (line 1))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking six>=1.5.2 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking requests>=1.1 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking simplejson>=2.0.9 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/simplejson/setup.py) egg_info for package simplejson

Downloading/unpacking futures>=2.1.3 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking oslo.serialization>=1.2.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking Babel>=1.3 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testervpue635y/build/Babel/setup.py) egg_info for package Babel

    warning: no previously-included files matching '*' found under directory 'docs/_build'
    warning: no previously-included files matching '*.pyc' found under directory 'tests'
    warning: no previously-included files matching '*.pyo' found under directory 'tests'
Downloading/unpacking argparse (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking netaddr>=0.7.12 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking pbr>=0.6,!=0.7,<1.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking oslo.config>=1.9.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking stevedore>=1.1.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking oslo.utils>=1.2.0 (from python-...

Revision history for this message
Francis Ginther (fginther) wrote :

psivaa,

looks like a flake8 error:

snappy_proposed_image_tester/__init__.py:35:80: E501 line too long (81 > 79 characters)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches