~glance-coresec/glance/cactus-trunk

« back to all changes in this revision

Viewing changes to tests/functional/test_curl_api.py

  • Committer: Tarmac
  • Author(s): jaypipes at gmail
  • Date: 2011-04-13 22:07:59 UTC
  • mfrom: (108.1.6 functional-tests)
  • Revision ID: tarmac-20110413220759-2sgwtflz7ma3oqqk
Tags: 2011.2rc1
Removes capture of exception from eventlet in _upload_and_activate(), which catches the exceptions that come from the _safe_kill() method properly.

Also fixes an incorrect call to _safe_kill() with mapping instead of image ID in the block of code that kills an image if a bad checksum is given.

Fixes bug #759018.

Show diffs side-by-side

added added

removed removed

Lines of Context:
415
415
                        "Size was supposed to be %d. Got:\n%s."
416
416
                        % (FIVE_GB, out))
417
417
 
 
418
        self.stop_servers()
 
419
 
418
420
    def test_traceback_not_consumed(self):
419
421
        """
420
422
        A test that errors coming from the POST API do not
447
449
            expected = "Content-Type must be application/octet-stream"
448
450
            self.assertTrue(expected in out,
449
451
                            "Could not find '%s' in '%s'" % (expected, out))
 
452
 
 
453
        self.stop_servers()