Merge lp:~fginther/core-image-tester/snappy-queue-updates into lp:~canonical-ci-engineering/core-image-tester/snappy-proposed-migration

[Francis Ginther]

Rename queues for snappy-proposed-migration version of core-image-tester.

Rename queues for snappy-proposed-migration version of core-image-tester.

[lp:~fginther/core-image-tester/snappy-queue-updates]

37. By Francis Ginther on 2015-05-22

Use constants for the queue names in the tests too.

[Joe Talbott (joetalbott)]

LGTM

review: Approve

[Paul Larson (pwlars)]

One suggestion, but it's not a blocker for me, so +1

review: Approve

[Francis Ginther (fginther)]

Paul, thanks for the review. My reasoning for using .format(SOLUTION_NAME) is to make it painfully obvious how the queues are named and hopefully make it easier for anyone copying this code in the future to use it for a new solution.

=== modified file 'core_image_tester/constants.py'
--- core_image_tester/constants.py	2015-05-21 21:41:49 +0000
+++ core_image_tester/constants.py	2015-05-22 21:15:17 +0000
@@ -19,24 +19,9 @@
 
 
 """Constants for this service."""
-# Queue names are constant, rather than being defined in the config.
-
-# The queue we listen to for new payloads to check:
-INPUT_QUEUE = "core.tests.v1"
-
-# The queue we put fatally error'd payloads into:
-DEAD_LETTER_QUEUE = "core.deadletters.v1"
-
-# The queue we put payloads on to re-run the test:
-TEST_RETRY_QUEUE = "core.tests.v1"
-
-# The queue we put results on:
-DONE_QUEUE = "core.result.v1"
-
-
 RETRY_COUNT = 3
 
-SOLUTION_NAME = "snappy-image-tests"
+SOLUTION_NAME = "snappy-proposed-migration"
 
 SERVICE_NAME = "core-image-tester"
 
@@ -47,3 +32,17 @@
     'service': SERVICE_NAME,
     'hostname': HOSTNAME,
 }
+
+# Queue names are constant, rather than being defined in the config.
+
+# The queue we listen to for new payloads to check:
+INPUT_QUEUE = "{}.tests.v1".format(SOLUTION_NAME)
+
+# The queue we put fatally error'd payloads into:
+DEAD_LETTER_QUEUE = "{}.deadletters.v1".format(SOLUTION_NAME)
+
+# The queue we put payloads on to re-run the test:
+TEST_RETRY_QUEUE = "{}.tests.v1".format(SOLUTION_NAME)
+
+# The queue we put results on:
+DONE_QUEUE = "{}.result.v1".format(SOLUTION_NAME)

=== modified file 'core_image_tester/tests/test_queue_integration.py'
--- core_image_tester/tests/test_queue_integration.py	2015-04-07 19:54:41 +0000
+++ core_image_tester/tests/test_queue_integration.py	2015-05-22 21:15:17 +0000
@@ -22,6 +22,7 @@
 
 
 from core_image_tester.queue import CoreImageTesterQueueMonitor
+from core_image_tester import constants
 
 
 class KombuQueueIntegrationTests(TestCase):
@@ -68,5 +69,5 @@
 
 
 def queue_message(conn, message):
-    q = conn.SimpleQueue('core.tests.v1')
+    q = conn.SimpleQueue(constants.INPUT_QUEUE)
     q.put(message)