Merge lp:~fginther/snappy-proposed-image-tester/rename-queues into lp:snappy-proposed-image-tester

[Francis Ginther]

Update queue names to match specification.

Update queue names to match specification.

[Thomi Richards (thomir-deactivatedaccount)]

lgtm

review: Approve

[Paul Larson (pwlars)]

looks good

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~fginther/snappy-proposed-image-tester/rename-queues 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-testerzzws7ou6/bin/python3
Also creating executable in /tmp/venv-snappy-proposed-image-testerzzws7ou6/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-testerzzws7ou6/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-testerzzws7ou6/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-testerzzws7ou6/build/amqp/setup.py) egg_info for package amqp

Downloading/unpacking requests>=1.1 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking futures>=2.1.3 (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-testerzzws7ou6/build/simplejson/setup.py) egg_info for package simplejson

Downloading/unpacking six>=1.5.2 (from python-swiftclient==2.4.0->-r requirements.txt (line 3))
Downloading/unpacking iso8601>=0.1.9 (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-testerzzws7ou6/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 oslo.config>=1.9.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking PrettyTable>=0.7,<0.8 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
  Running setup.py (path:/tmp/venv-snappy-proposed-image-testerzzws7ou6/build/PrettyTable/setup.py) egg_info for package PrettyTable

Downloading/unpacking argparse (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpacking oslo.serialization>=1.2.0 (from python-keystoneclient==1.3.0->-r requirements.txt (line 4))
Downloading/unpackin...

[lp:~fginther/snappy-proposed-image-tester/rename-queues]

40. By Francis Ginther on 2015-05-28

Ooops, '=' not '=='!

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

[Celso Providelo (cprov)]

review: Approve

=== modified file 'snappy_proposed_image_tester/constants.py'
--- snappy_proposed_image_tester/constants.py	2015-05-27 18:28:14 +0000
+++ snappy_proposed_image_tester/constants.py	2015-05-28 02:33:07 +0000
@@ -34,15 +34,16 @@
 }
 
 # Queue names are constant, rather than being defined in the config.
+QUEUE_PREFIX = "snappy-proposed"
 
 # The queue we listen to for new payloads to check:
-INPUT_QUEUE = "{}.tests.v1".format(SOLUTION_NAME)
+INPUT_QUEUE = "{}.tests.v1".format(QUEUE_PREFIX)
 
 # The queue we put fatally error'd payloads into:
-DEAD_LETTER_QUEUE = "{}.deadletters.v1".format(SOLUTION_NAME)
+DEAD_LETTER_QUEUE = "{}.deadletters.v1".format(QUEUE_PREFIX)
 
 # The queue we put payloads on to re-run the test:
-TEST_RETRY_QUEUE = "{}.tests.v1".format(SOLUTION_NAME)
+TEST_RETRY_QUEUE = "{}.tests.v1".format(QUEUE_PREFIX)
 
 # The queue we put results on:
-DONE_QUEUE = "{}.result.v1".format(SOLUTION_NAME)
+DONE_QUEUE = "{}.results.v1".format(QUEUE_PREFIX)