Merge lp:~ursinha/uci-engine/update-ticket-raises-error into lp:uci-engine

[Ursula Junque]

Display better errors in case requests fail during ticket creation

This branch ensures all requests will raise exceptions if their return codes are errors. What happened in bug 1337294 should be a rare problem, and until we understand what happened it's hard to find a definitive solution. If that happens again, now it's explicit that the problem happens while update_ticket, and while we don't have a retry mechanism I'm directing the user to let an admin know what happened, to be able to manually set it to "Queued".

[lp:~ursinha/uci-engine/update-ticket-raises-error]

647. By Ursula Junque on 2014-07-04

Oops, test case was named wrong

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:647
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1013/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1013/rebuild

review: Approve (continuous-integration)

[Andy Doan (doanac)]

I have a question about what we print out during a failure. Since I'll be off tomorrow, don't let my question block things if you have sorted out.

[Ursula Junque (ursinha)]

I've replied inline, thanks Andy.

[lp:~ursinha/uci-engine/update-ticket-raises-error]

648. By Ursula Junque on 2014-07-04

Fixing variable names on cli utils, there were misleading

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:648
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1015/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1015/rebuild

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

This is a step forward and I'll approve. I would like to make sure we take a closer look at the other post and get calls within the cli (and indeed all code) and make sure we're not dropping relevant error messages.

review: Approve

[Ursula Junque (ursinha)]

> This is a step forward and I'll approve. I would like to make sure we take a
> closer look at the other post and get calls within the cli (and indeed all
> code) and make sure we're not dropping relevant error messages.

All of the posts, gets and patches are covered now, using utils.patch, utils.post and utils.get will always raise_for_status and main cli script will catch and print that. I agree we still need to revisit how we handle exceptions to see if we're not losing important information we could be displaying.

=== modified file 'cli/ci_cli/tests/__init__.py'
--- cli/ci_cli/tests/__init__.py	2014-06-19 23:38:34 +0000
+++ cli/ci_cli/tests/__init__.py	2014-07-04 03:45:58 +0000
@@ -45,8 +45,8 @@
     sys.stdout = out
 
 
-class FakeRequestsReturn:
-    """Object to mock the return of python-requests return."""
+class FakeResponse:
+    """Object to mock a python-requests response."""
 
     def __init__(self, code, content, reason=None):
         self.status_code = code

=== modified file 'cli/ci_cli/tests/test_cli.py'
--- cli/ci_cli/tests/test_cli.py	2014-07-01 17:02:35 +0000
+++ cli/ci_cli/tests/test_cli.py	2014-07-04 03:45:58 +0000
@@ -29,7 +29,7 @@
     capture_stderr,
     capture_stdout,
     MainScriptTestCase,
-    FakeRequestsReturn,
+    FakeResponse,
 )
 from ci_utils.testing import get_test_file_path
 from ci_utils.ticket_states import (
@@ -62,7 +62,7 @@
             "removed_binaries": "myoldpackage",
         }
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(data))
+            FakeResponse(200, json.dumps(data))
         ]
         args = ['status', '-t', '5']
         with capture_stdout(self.cli.main, args) as cm:
@@ -101,7 +101,7 @@
             ]
         }
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(data))
+            FakeResponse(200, json.dumps(data))
         ]
         args = ['status']
         with capture_stdout(self.cli.main, args) as cm:
@@ -159,7 +159,7 @@
     def test_ts_server_returns_urlerror(self, mock_requests):
         """Test cli response to ts server refusing connection (111)."""
         mock_requests.side_effect = [
-            FakeRequestsReturn(
+            FakeResponse(
                 400, '', socket.error(111, "Connection refused"))
         ]
         args = ['status']
@@ -176,7 +176,7 @@
     def test_ts_server_returns_internal_server_error(self, mock_requests):
         """Test cli response to ts server returning error 500."""
         mock_requests.side_effect = [
-            FakeRequestsReturn(
+            FakeResponse(
                 500, "", "INTERNAL SERVER ERROR"
             )
         ]
@@ -193,7 +193,7 @@
     def test_ts_server_returns_url_not_found(self, mock_requests):
         """Test cli response to ts server returning 404 error."""
         mock_requests.side_effect = [
-            FakeRequestsReturn(404, '', 'Not Found')
+            FakeResponse(404, '', 'Not Found')
         ]
         args = ['status']
         with LogCapture() as lc:
@@ -221,7 +221,7 @@
     def test_ts_server_returns_other_httperror(self, mock_requests):
         """Test cli response to ts server returning HTTPError."""
         mock_requests.side_effect = [
-            FakeRequestsReturn(403, '', 'Forbidden')
+            FakeResponse(403, '', 'Forbidden')
         ]
         args = ['status']
         with LogCapture() as lc:
@@ -246,18 +246,18 @@
         # CLI 'create_ticket' action allows users to upload new sources
         # via gatekeeper (without swift credentials).
         mocked_post.side_effect = [
-            FakeRequestsReturn(201, '/ticket/1/sandbox/UUID'),
-            FakeRequestsReturn(201, '/ticket.html?ticket_id=1'),
+            FakeResponse(201, '/ticket/1/sandbox/UUID'),
+            FakeResponse(201, '/ticket.html?ticket_id=1'),
         ]
         mocked_put.side_effect = [
-            FakeRequestsReturn(200, 'A_TEMP_URL'),
-            FakeRequestsReturn(201, '/a_sandbox_object_url/'),
-            FakeRequestsReturn(200, 'A_TEMP_URL'),
-            FakeRequestsReturn(201, '/a_sandbox_object_url/'),
-            FakeRequestsReturn(200, 'A_TEMP_URL'),
-            FakeRequestsReturn(201, '/a_sandbox_object_url/'),
-            FakeRequestsReturn(200, 'A_TEMP_URL'),
-            FakeRequestsReturn(201, '/a_sandbox_object_url/'),
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(201, '/a_sandbox_object_url/'),
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(201, '/a_sandbox_object_url/'),
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(201, '/a_sandbox_object_url/'),
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(201, '/a_sandbox_object_url/'),
         ]
         mocked_of.return_value = 'a_content'
         foobar_changes = get_test_file_path('foobar_0.1-1_source.changes')
@@ -272,7 +272,8 @@
         # The first output line contains a local absolute host path, so
         # it is ignored.
         self.assertEquals(
-            ['Validating .changes file...',
+            ['Parsing foobar_0.1-1_source.changes...',
+             'Validating .changes...',
              'foobar_0.1-1 parsed and validated.',
              'Created source package upload: http://mocked/api/v1/ticket/1/',
              'Created subticket: http://mocked/api/v1/ticket/1/',
@@ -285,7 +286,68 @@
              'Created artifact: http://mocked/api/v1/ticket/1/',
              'Created artifact: http://mocked/api/v1/ticket/1/',
              'Created artifact: http://mocked/api/v1/ticket/1/'],
-            list([r.msg for r in lc.records])[1:])
+            list([r.msg for r in lc.records]))
+
+    @mock.patch('ci_cli.utils.post',
+                return_value='http://mocked/api/v1/ticket/1/')
+    @mock.patch('ci_cli.utils.get')
+    @mock.patch('ci_cli.ticket._open_file')
+    @mock.patch('requests.put')
+    @mock.patch('requests.post')
+    @mock.patch('requests.patch')
+    def test_create_ticket_update_fails(
+            self, mocked_patch, mocked_post, mocked_put, mocked_of, mocked_get,
+            mocked_upost):
+        # CLI 'create_ticket' action allows users to upload new sources
+        # via gatekeeper (without swift credentials).
+        mocked_post.side_effect = [
+            FakeResponse(201, '/ticket/1/sandbox/UUID'),
+            FakeResponse(201, '/ticket.html?ticket_id=1'),
+        ]
+        mocked_put.side_effect = [
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(201, '/a_sandbox_object_url/'),
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(201, '/a_sandbox_object_url/'),
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(201, '/a_sandbox_object_url/'),
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(201, '/a_sandbox_object_url/'),
+        ]
+        mocked_of.return_value = 'a_content'
+        foobar_changes = get_test_file_path('foobar_0.1-1_source.changes')
+        args = ['-v2', 'create_ticket', '-t', '"New feature"', '-d',
+                '"New feature description"', '-o', '[e-mail]',
+                '-a', 'foobar', '-s', foobar_changes]
+        mocked_patch.side_effect = [
+            FakeResponse(401, {}, "Failed to patch ticket")]
+        with LogCapture() as lc:
+            logger = logging.getLogger()
+            self.cli.main(args, log=logger)
+        ticket_url = urlparse.urljoin(
+            utils.CI_URL, '/ticket.html?ticket_id=1')
+        # The first output line contains a local absolute host path, so
+        # it is ignored.
+        self.assertEquals(
+            ['Parsing foobar_0.1-1_source.changes...',
+             'Validating .changes...',
+             'foobar_0.1-1 parsed and validated.',
+             'Created source package upload: http://mocked/api/v1/ticket/1/',
+             'Created subticket: http://mocked/api/v1/ticket/1/',
+             'Uploading foobar_0.1-1.dsc ...',
+             'Uploading foobar_0.1.orig.tar.gz ...',
+             'Uploading foobar_0.1-1.debian.tar.gz ...',
+             'Uploading foobar_0.1-1_source.changes ...',
+             'Done! Access {} for more information.'.format(ticket_url),
+             'Created artifact: http://mocked/api/v1/ticket/1/',
+             'Created artifact: http://mocked/api/v1/ticket/1/',
+             'Created artifact: http://mocked/api/v1/ticket/1/',
+             'Created artifact: http://mocked/api/v1/ticket/1/',
+             'Ticket was created successfully but there was a problem adding '
+             'it to the queue: 401 Client Error: Failed to patch ticket. This '
+             'should be a transient error, please contact an admin. Your '
+             'ticket number is 1.'],
+            list([r.msg for r in lc.records]))
 
 
 class CliArgumentsTestCase(MainScriptTestCase):

=== modified file 'cli/ci_cli/tests/test_get_ticket_status.py'
--- cli/ci_cli/tests/test_get_ticket_status.py	2014-05-26 13:47:38 +0000
+++ cli/ci_cli/tests/test_get_ticket_status.py	2014-07-04 03:45:58 +0000
@@ -21,7 +21,7 @@
 from ci_cli.tests import (
     capture_stdout,
     MainScriptTestCase,
-    FakeRequestsReturn,
+    FakeResponse,
 )
 from ci_utils.ticket_states import (
     TicketWorkflowStep,
@@ -47,7 +47,7 @@
             "removed_binaries": "myoldpackage",
         }
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(data))
+            FakeResponse(200, json.dumps(data))
         ]
         args = self.cli.parse_arguments(['status', '-t', '100'])
         with capture_stdout(args.func, args) as cm:
@@ -82,7 +82,7 @@
             "removed_binaries": "myoldpackage",
         }
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(data))
+            FakeResponse(200, json.dumps(data))
         ]
         args = self.cli.parse_arguments(['status', '-t', '100'])
         with capture_stdout(args.func, args) as cm:
@@ -117,7 +117,7 @@
             "removed_binaries": "myoldpackage",
         }
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(data))
+            FakeResponse(200, json.dumps(data))
         ]
         args = self.cli.parse_arguments(['status', '-t', '100'])
         with capture_stdout(args.func, args) as cm:
@@ -166,7 +166,7 @@
             ]
         }
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(data))
+            FakeResponse(200, json.dumps(data))
         ]
         args = self.cli.parse_arguments(['status'])
         with capture_stdout(args.func, args) as cm:
@@ -181,7 +181,7 @@
     @mock.patch('requests.get')
     def test_get_status_404_response(self, mock_requests):
         mock_requests.side_effect = [
-            FakeRequestsReturn(404, '', 'Not Found')
+            FakeResponse(404, '', 'Not Found')
         ]
         args = self.cli.parse_arguments(['status', '-t', '99'])
         with self.assertRaises(SystemExit) as cm:

=== modified file 'cli/ci_cli/tests/test_image.py'
--- cli/ci_cli/tests/test_image.py	2014-06-11 02:56:45 +0000
+++ cli/ci_cli/tests/test_image.py	2014-07-04 03:45:58 +0000
@@ -24,7 +24,7 @@
 from ci_cli.image import ImageObjectNotFound
 from ci_cli.tests import (
     MainScriptTestCase,
-    FakeRequestsReturn,
+    FakeResponse,
 )
 
 
@@ -83,9 +83,9 @@
         # the image file is downloaded and stored in the specified
         # path.
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(artifact_data)),
-            FakeRequestsReturn(200, json.dumps(artifact_tempurls)),
-            FakeRequestsReturn(200, 'IMAGE_CONTENT'),
+            FakeResponse(200, json.dumps(artifact_data)),
+            FakeResponse(200, json.dumps(artifact_tempurls)),
+            FakeResponse(200, 'IMAGE_CONTENT'),
         ]
         args = self.cli.parse_arguments(
             ['get_image', '-t', '4', '-n', self.image_path])
@@ -102,8 +102,8 @@
         # If the corresponding tempurl for a registered image cannot
         # be found ImageObjectNotFound() is raised.
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(artifact_data)),
-            FakeRequestsReturn(200, json.dumps({})),
+            FakeResponse(200, json.dumps(artifact_data)),
+            FakeResponse(200, json.dumps({})),
         ]
         args = self.cli.parse_arguments(
             ['get_image', '-t', '4', '-n', self.image_path])
@@ -131,10 +131,10 @@
         # If a ticket number is not specified, CLI looks for the
         # latest COMPLETED ticket and downloads its image.
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(ticket_data)),
-            FakeRequestsReturn(200, json.dumps(artifact_data)),
-            FakeRequestsReturn(200, json.dumps(artifact_tempurls)),
-            FakeRequestsReturn(200, 'IMAGE_CONTENT'),
+            FakeResponse(200, json.dumps(ticket_data)),
+            FakeResponse(200, json.dumps(artifact_data)),
+            FakeResponse(200, json.dumps(artifact_tempurls)),
+            FakeResponse(200, 'IMAGE_CONTENT'),
         ]
         args = self.cli.parse_arguments(
             ['get_image', '-n', self.image_path])
@@ -146,7 +146,7 @@
         # If no ticket is specified and there are no COMPLETED tickets
         # the CLI renders a message indicating the problem.
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps({'objects': []})),
+            FakeResponse(200, json.dumps({'objects': []})),
         ]
         args = self.cli.parse_arguments(
             ['get_image', '-n', self.image_path])

=== modified file 'cli/ci_cli/tests/test_ticket.py'
--- cli/ci_cli/tests/test_ticket.py	2014-07-01 03:48:44 +0000
+++ cli/ci_cli/tests/test_ticket.py	2014-07-04 03:45:58 +0000
@@ -19,7 +19,7 @@
 import unittest
 
 from ci_cli.tests import (
-    FakeRequestsReturn,
+    FakeResponse,
     MainScriptTestCase,
 )
 from ci_cli.ticket import (
@@ -44,7 +44,7 @@
         spu = SourcePackageUpload('1', 'http://server/')
         self.assertIsNone(spu.sandbox_url)
         mocked_post.side_effect = [
-            FakeRequestsReturn(404, 'Zoing!')
+            FakeResponse(404, 'Zoing!')
         ]
         with self.assertRaises(SourcePackageUploadError) as cm:
             spu.create()
@@ -60,7 +60,7 @@
         spu = SourcePackageUpload('1', 'http://server/')
         self.assertIsNone(spu.sandbox_url)
         mocked_post.side_effect = [
-            FakeRequestsReturn(201, '/ticket/1/sandbox/UUID')
+            FakeResponse(201, '/ticket/1/sandbox/UUID')
         ]
         spu.create()
         self.assertEquals(
@@ -82,14 +82,14 @@
         # `upload` raises an error if it cannot get a tempurl from GK
         # of cannot PUT on the swift tempurl.
         mocked_post.side_effect = [
-            FakeRequestsReturn(201, '/ticket/1/sandbox/UUID'),
+            FakeResponse(201, '/ticket/1/sandbox/UUID'),
         ]
         spu = SourcePackageUpload('1', 'http://server/')
         spu.create()
         mocked_put.side_effect = [
-            FakeRequestsReturn(404, 'Not Found'),
-            FakeRequestsReturn(200, 'A_TEMP_URL'),
-            FakeRequestsReturn(401, 'Not Authorized'),
+            FakeResponse(404, 'Not Found'),
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(401, 'Not Authorized'),
         ]
         with self.assertRaises(SourcePackageUploadError) as cm:
             spu.upload('not_found_filename')
@@ -111,13 +111,13 @@
         # `upload` returns the GK response content (created object
         # sandbox path) when it works.
         mocked_post.side_effect = [
-            FakeRequestsReturn(201, '/ticket/1/sandbox/UUID'),
+            FakeResponse(201, '/ticket/1/sandbox/UUID'),
         ]
         spu = SourcePackageUpload('1', 'http://server/')
         spu.create()
         mocked_put.side_effect = [
-            FakeRequestsReturn(200, 'A_TEMP_URL'),
-            FakeRequestsReturn(201, '/a_sandbox_object_url/'),
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(201, '/a_sandbox_object_url/'),
         ]
         mocked_of.return_value = 'a_content'
         result = spu.upload('a_file')
@@ -138,8 +138,8 @@
         # `process` raises `SourcePackageUploadError` with the GK
         # response content (upload remote validation error).
         mocked_post.side_effect = [
-            FakeRequestsReturn(201, '/ticket/1/sandbox/UUID'),
-            FakeRequestsReturn(400, 'Problem!'),
+            FakeResponse(201, '/ticket/1/sandbox/UUID'),
+            FakeResponse(400, 'Problem!'),
         ]
         spu = SourcePackageUpload('1', 'http://server/')
         spu.create()
@@ -153,8 +153,8 @@
         # `process` returns the GK response content (upload validation
         # results) when it works.
         mocked_post.side_effect = [
-            FakeRequestsReturn(201, '/ticket/1/sandbox/UUID'),
-            FakeRequestsReturn(201, 'Success!'),
+            FakeResponse(201, '/ticket/1/sandbox/UUID'),
+            FakeResponse(201, 'Success!'),
         ]
         spu = SourcePackageUpload('1', 'http://server/')
         spu.create()
@@ -168,12 +168,12 @@
         # Using `SourcePackageUpload` as a context manager makes your
         # life easier!
         mocked_post.side_effect = [
-            FakeRequestsReturn(201, '/ticket/1/sandbox/UUID'),
-            FakeRequestsReturn(201, 'Success!'),
+            FakeResponse(201, '/ticket/1/sandbox/UUID'),
+            FakeResponse(201, 'Success!'),
         ]
         mocked_put.side_effect = [
-            FakeRequestsReturn(200, 'A_TEMP_URL'),
-            FakeRequestsReturn(201, '/a_sandbox_object_url/'),
+            FakeResponse(200, 'A_TEMP_URL'),
+            FakeResponse(201, '/a_sandbox_object_url/'),
         ]
         mocked_of.return_value = 'a_content'
 

=== modified file 'cli/ci_cli/tests/test_utils.py'
--- cli/ci_cli/tests/test_utils.py	2014-06-19 23:38:34 +0000
+++ cli/ci_cli/tests/test_utils.py	2014-07-04 03:45:58 +0000
@@ -17,10 +17,12 @@
 
 import json
 import mock
+import unittest
 
 from ci_cli import utils
-from ci_cli.tests import FakeRequestsReturn
+from ci_cli.tests import FakeResponse
 from ci_utils.testing import TestCaseWithGnupg
+from requests import exceptions
 
 
 config_contents = """auth_url: http://example.com
@@ -32,6 +34,62 @@
 """
 
 
+class TestBasicRequest(unittest.TestCase):
+
+    @mock.patch('requests.get')
+    def test_get(self, mocked_get):
+        mocked_get.side_effect = [FakeResponse(200, '{"foo": ["bar", "baz"]}')]
+        result = utils.get("foo")
+        self.assertEquals(result, {u'foo': [u'bar', u'baz']})
+        mocked_get.assert_called_once()
+
+    @mock.patch('requests.get')
+    def test_get_fails(self, mocked_get):
+        mocked_get.side_effect = [FakeResponse(502, {}, "Failed get()!")]
+        with self.assertRaises(exceptions.HTTPError) as cm:
+            utils.get("foo")
+        mocked_get.assert_called_once()
+        self.assertEquals(
+            cm.exception.message, "502 Server Error: Failed get()!")
+
+    @mock.patch('requests.get')
+    def test_get_returns_invalid_content(self, mocked_get):
+        mocked_get.side_effect = [FakeResponse(200, "Ohh, this is invalid")]
+        with self.assertRaises(ValueError) as cm:
+            utils.get("foo")
+        mocked_get.assert_called_once()
+        self.assertEquals(
+            cm.exception.message, "No JSON object could be decoded")
+
+    @mock.patch('requests.patch')
+    def test_patch(self, mocked_patch):
+        utils.patch("foo", {}, {})
+        mocked_patch.assert_called_once()
+
+    @mock.patch('requests.patch')
+    def test_patch_fails(self, mocked_patch):
+        mocked_patch.side_effect = [FakeResponse(502, {}, "Failed patch()!")]
+        with self.assertRaises(exceptions.HTTPError) as cm:
+            utils.patch("foo", {}, {})
+        mocked_patch.assert_called_once()
+        self.assertEquals(
+            cm.exception.message, "502 Server Error: Failed patch()!")
+
+    @mock.patch('requests.post')
+    def test_post(self, mocked_post):
+        utils.post("foo", {}, {})
+        mocked_post.assert_called_once()
+
+    @mock.patch('requests.post')
+    def test_post_fails(self, mocked_post):
+        mocked_post.side_effect = [FakeResponse(502, {}, "Failed post()!")]
+        with self.assertRaises(exceptions.HTTPError) as cm:
+            utils.post("foo", {}, {})
+        mocked_post.assert_called_once()
+        self.assertEquals(
+            cm.exception.message, "502 Server Error: Failed post()!")
+
+
 class UtilsTestCase(TestCaseWithGnupg):
     def test_parse_id(self):
         location = 'http://www.example.com/api/v1/ticket/5/'
@@ -50,7 +108,7 @@
     def test_get_sourcepackage_uri(self, mock_requests):
         data = {"objects": [{"resource_uri": "/api/v1/sourcepackage/4/"}]}
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(data))
+            FakeResponse(200, json.dumps(data))
         ]
         uri = utils.get_sourcepackage_uri('foobar')
         mock_requests.assert_called_once()
@@ -60,7 +118,7 @@
     def test_get_sourcepackage_uri_not_found(self, mock_requests):
         data = {"objects": []}
         mock_requests.side_effect = [
-            FakeRequestsReturn(200, json.dumps(data))
+            FakeResponse(200, json.dumps(data))
         ]
         uri = utils.get_sourcepackage_uri('foobar')
         mock_requests.assert_called_once()

=== modified file 'cli/ci_cli/ticket.py'
--- cli/ci_cli/ticket.py	2014-07-01 03:43:40 +0000
+++ cli/ci_cli/ticket.py	2014-07-04 03:45:58 +0000
@@ -50,6 +50,10 @@
     """Raised where there is an error during the SPU."""
 
 
+class QueueingTicketError(Exception):
+    """Raised when ticket failed to be set to Queued."""
+
+
 class SourcePackageUpload(object):
     """Context manager helper for performing SPUs via Gatekeeper."""
 
@@ -145,18 +149,18 @@
         return ''
 
     def _parse_changes(self, changes_filepath):
-        log.info("Parsing %s..." % changes_filepath)
+        log.info("Parsing {}...".format(os.path.basename(changes_filepath)))
         changes = ChangesProcessor(
             changes_filepath=changes_filepath)
-        log.info("Validating .changes file...")
+        log.info("Validating .changes...")
         self.files = changes.process()
         self.version = changes.source_version
         self.suite = changes.suite
         self.series = self.suite.split("-")[0]
         self.sourcepackage = changes.source_package_name
         self.version = changes.source_version
-        log.info("%s_%s parsed and validated." % (self.sourcepackage,
-                                                  self.version))
+        log.info("{}_{} parsed and validated.".format(
+            self.sourcepackage, self.version))
 
     def _process(self):
         self._create_spu()
@@ -253,9 +257,16 @@
             "status": TicketWorkflowStepStatus.QUEUED.value,
         }
         urlbase = utils.CI_URL + utils.API_URL + 'updateticketstatus/'
-        utils.patch(urlbase + self.ticket_id + '/', data=data)
-        print("You have successfully submitted a ticket to the Ubuntu CI"
-              " Engine. Your ticket number is %s." % self.ticket_id)
+        try:
+            utils.patch(urlbase + self.ticket_id + '/', data=data)
+            print("You have successfully submitted a ticket to the Ubuntu CI "
+                  "Engine. Your ticket number is %s." % self.ticket_id)
+        except Exception as exc:
+            raise QueueingTicketError(
+                "Ticket was created successfully but there was a problem "
+                "adding it to the queue: {}. This should be a transient "
+                "error, please contact an admin. Your ticket number is "
+                "{}.".format(exc, self.ticket_id))
 
     def add_new_ticket(self, args):
         suites = []

=== modified file 'cli/ci_cli/utils.py'
--- cli/ci_cli/utils.py	2014-06-20 14:14:15 +0000
+++ cli/ci_cli/utils.py	2014-07-04 03:45:58 +0000
@@ -42,19 +42,21 @@
 
 
 def post(url, data, headers=HEADERS, patch=False):
-    req = requests.post(url=url, data=json.dumps(data), headers=HEADERS)
-    resp = req.headers
-    return resp['location']
+    response = requests.post(url=url, data=json.dumps(data), headers=HEADERS)
+    response.raise_for_status()
+    headers = response.headers
+    return headers['location']
 
 
 def patch(url, data, headers=HEADERS):
-    requests.patch(url=url, data=json.dumps(data), headers=HEADERS)
+    response = requests.patch(url=url, data=json.dumps(data), headers=HEADERS)
+    response.raise_for_status()
 
 
 def get(url):
-    r = requests.get(url)
-    r.raise_for_status()
-    return r.json()
+    response = requests.get(url)
+    response.raise_for_status()
+    return response.json()
 
 
 def parse_id(location):

=== modified file 'cli/ubuntu-ci'
--- cli/ubuntu-ci	2014-07-01 03:43:40 +0000
+++ cli/ubuntu-ci	2014-07-04 03:45:58 +0000
@@ -184,7 +184,8 @@
         else:
             log.error(error)
     except (ticket.SourcePackageUploadError,
-            ticket.MismatchSuitesError) as exc:
+            ticket.MismatchSuitesError,
+            ticket.QueueingTicketError) as exc:
         log.error(exc.message)
     except Exception:
         log.exception('Unexpected exception')