← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/tests/image/test_s3.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/image/test_s3.py
20
20
from nova import context
21
21
import nova.db.api
22
22
from nova import exception
 
23
from nova.image import s3
23
24
from nova import test
24
 
from nova.image import s3
25
25
 
26
26
 
27
27
ami_manifest_xml = """<?xml version="1.0" ?>
134
134
        self.assertEqual(block_device_mapping, expected_bdm)
135
135
 
136
136
    def test_s3_malicious_tarballs(self):
137
 
        self.assertRaises(exception.Error,
 
137
        self.assertRaises(exception.NovaException,
138
138
            self.image_service._test_for_malicious_tarball,
139
139
            "/unused", os.path.join(os.path.dirname(__file__), 'abs.tar.gz'))
140
 
        self.assertRaises(exception.Error,
 
140
        self.assertRaises(exception.NovaException,
141
141
            self.image_service._test_for_malicious_tarball,
142
142
            "/unused", os.path.join(os.path.dirname(__file__), 'rel.tar.gz'))