~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/test_wsgi.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-07-06 10:18:33 UTC
  • mfrom: (1.1.58)
  • Revision ID: package-import@ubuntu.com-20120706101833-wp2nv392mpe9re8p
Tags: 2012.2~f2-0ubuntu1
[ Adam Gandelman ]
* Use new rootwrap configuration structure:
  - debian/nova-{compute, network, volume}.{pyinstall, pyremove}: Dropped.
  - debian/nova-common.dirs: Add /etc/nova/rootwrap.d/.
  - debian/nova-common.install: Install /etc/nova/rootwrap.conf.
  - debian/debian/nova.conf: Reference rootwrap.conf in calls to
    nova-rootwrap.
  - debian/nova-{compute, network, volume}.install: Install corresponding
    filter in /etc/nova/rootwrap.d/
* debian/rules: Install logging_sample.conf to /etc/nova/logging.conf
  as part of nova-common.
* debian/pydist-overrides: Add setuptools-git.
* debian/control: Add python-setuptools-git as a Build-Depends.
* debian/rules: Do not remove nova.egg-info during auto_clean.  Now that
  upstream has moved to setuptools-git, doing so results in missing files
  from built package.

[ Chuck Short ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
        result = request.best_match_content_type()
76
76
        self.assertEqual(result, "application/json")
77
77
 
 
78
    def test_cache_and_retrieve_instances(self):
 
79
        request = wsgi.Request.blank('/foo')
 
80
        instances = []
 
81
        for x in xrange(3):
 
82
            instances.append({'uuid': 'uuid%s' % x})
 
83
        # Store 2
 
84
        request.cache_db_instances(instances[:2])
 
85
        # Store 1
 
86
        request.cache_db_instance(instances[2])
 
87
        self.assertEqual(request.get_db_instance('uuid0'),
 
88
                instances[0])
 
89
        self.assertEqual(request.get_db_instance('uuid1'),
 
90
                instances[1])
 
91
        self.assertEqual(request.get_db_instance('uuid2'),
 
92
                instances[2])
 
93
        self.assertEqual(request.get_db_instance('uuid3'), None)
 
94
        self.assertEqual(request.get_db_instances(),
 
95
                {'uuid0': instances[0],
 
96
                 'uuid1': instances[1],
 
97
                 'uuid2': instances[2]})
 
98
 
78
99
 
79
100
class ActionDispatcherTest(test.TestCase):
80
101
    def test_dispatch(self):
215
236
        expected = 'off'
216
237
        self.assertEqual(actual, expected)
217
238
 
218
 
    def test_get_method_unknown_controller_action(self):
 
239
    def test_get_method_unknown_controller_method(self):
219
240
        class Controller(object):
220
241
            def index(self, req, pants=None):
221
242
                return pants