← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/test_common.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/api/openstack/test_common.py
24
24
import webob.exc
25
25
import xml.dom.minidom as minidom
26
26
 
 
27
from nova.api.openstack import common
 
28
from nova.api.openstack import xmlutil
27
29
from nova import exception
28
30
from nova import test
29
 
from nova.api.openstack import common
30
 
from nova.api.openstack import xmlutil
 
31
from nova.tests import utils as test_utils
31
32
 
32
33
 
33
34
NS = "{http://docs.openstack.org/compute/api/v1.1}"
328
329
        else:
329
330
            self.fail("webob.exc.HTTPConflict was not raised")
330
331
 
 
332
    def test_check_img_metadata_properties_quota_valid_metadata(self):
 
333
        ctxt = test_utils.get_test_admin_context()
 
334
        metadata1 = {"key": "value"}
 
335
        actual = common.check_img_metadata_properties_quota(ctxt, metadata1)
 
336
        self.assertEqual(actual, None)
 
337
 
 
338
        metadata2 = {"key": "v" * 260}
 
339
        actual = common.check_img_metadata_properties_quota(ctxt, metadata2)
 
340
        self.assertEqual(actual, None)
 
341
 
 
342
        metadata3 = {"key": ""}
 
343
        actual = common.check_img_metadata_properties_quota(ctxt, metadata3)
 
344
        self.assertEqual(actual, None)
 
345
 
 
346
    def test_check_img_metadata_properties_quota_inv_metadata(self):
 
347
        ctxt = test_utils.get_test_admin_context()
 
348
        metadata1 = {"a" * 260: "value"}
 
349
        self.assertRaises(webob.exc.HTTPBadRequest,
 
350
                common.check_img_metadata_properties_quota, ctxt, metadata1)
 
351
 
 
352
        metadata2 = {"": "value"}
 
353
        self.assertRaises(webob.exc.HTTPBadRequest,
 
354
                common.check_img_metadata_properties_quota, ctxt, metadata2)
 
355
 
 
356
        metadata3 = "invalid metadata"
 
357
        self.assertRaises(webob.exc.HTTPBadRequest,
 
358
                common.check_img_metadata_properties_quota, ctxt, metadata3)
 
359
 
331
360
 
332
361
class MetadataXMLDeserializationTest(test.TestCase):
333
362