Merge lp:~jaypipes/glance/bug755912 into lp:~glance-coresec/glance/cactus-trunk

[Jay Pipes]

Fix up the way the exception is raised from _safe_kill()... When I "fixed" bug 729726, I mistakenly used the traceback as the message. doh.

[Rick Harris (rconradharris)]

lgtm, thanks for the fix Jay!

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'glance/server.py'
--- glance/server.py	2011-04-04 14:32:14 +0000
+++ glance/server.py	2011-04-11 19:24:35 +0000
@@ -344,7 +344,7 @@
             # exception context was destroyed by Eventlet. To work around
             # this, we need to 'memorize' the exception context, and then
             # re-raise here.
-            raise exc_type(exc_traceback)
+            raise exc_type(exc_value)
 
     def create(self, req):
         """

=== modified file 'tests/functional/test_curl_api.py'
--- tests/functional/test_curl_api.py	2011-04-08 02:05:38 +0000
+++ tests/functional/test_curl_api.py	2011-04-11 19:24:35 +0000
@@ -19,6 +19,7 @@
 
 import json
 import os
+import tempfile
 import unittest
 
 from tests import functional
@@ -413,3 +414,36 @@
         self.assertTrue("X-Image-Meta-Size: %d" % FIVE_GB in out,
                         "Size was supposed to be %d. Got:\n%s."
                         % (FIVE_GB, out))
+
+    def test_traceback_not_consumed(self):
+        """
+        A test that errors coming from the POST API do not
+        get consumed and print the actual error message, and
+        not something like <traceback object at 0x1918d40>
+
+        :see https://bugs.launchpad.net/glance/+bug/755912
+        """
+
+        self.cleanup()
+        api_port, reg_port, conf_file = self.start_servers()
+
+        # POST /images with binary data, but not setting
+        # Content-Type to application/octet-stream, verify a
+        # 400 returned and that the error is readable.
+        with tempfile.NamedTemporaryFile() as test_data_file:
+            test_data_file.write("XXX")
+            test_data_file.flush()
+            cmd = ("curl -i -X POST --upload-file %s "
+                   "http://0.0.0.0:%d/images") % (test_data_file.name,
+                                                  api_port)
+
+            exitcode, out, err = execute(cmd)
+            self.assertEqual(0, exitcode)
+
+            lines = out.split("\r\n")
+            status_line = lines.pop(0)
+
+            self.assertEqual("HTTP/1.1 400 Bad Request", status_line)
+            expected = "Content-Type must be application/octet-stream"
+            self.assertTrue(expected in out,
+                            "Could not find '%s' in '%s'" % (expected, out))