diff options
| author | Naveed Massjouni <naveedm9@gmail.com> | 2011-03-15 19:55:13 -0400 |
|---|---|---|
| committer | Naveed Massjouni <naveedm9@gmail.com> | 2011-03-15 19:55:13 -0400 |
| commit | bee1951ac78688e49939aee4e2285ef0ff89adb2 (patch) | |
| tree | 18cf625b9888a62786e535a86f6459401e5b0fc7 /nova/tests | |
| parent | d4f859803eeb5a123835a3996ccfc64d35dbcb4b (diff) | |
As suggested by Eric Day:
* changed request.environ version key to more descriptive 'api.version'
* removed python3 string formatting
* added licenses to headers on new files
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/fakes.py | 4 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_servers.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py index 9c3b53ac7..a3968b57b 100644 --- a/nova/tests/api/openstack/fakes.py +++ b/nova/tests/api/openstack/fakes.py @@ -69,8 +69,8 @@ def fake_auth_init(self, application): @webob.dec.wsgify def fake_wsgi(self, req): req.environ['nova.context'] = context.RequestContext(1, 1) - if not req.environ.get('version'): - req.environ['version'] = '1.0' + if not req.environ.get('api.version'): + req.environ['api.version'] = '1.0' if req.body: req.environ['inst_dict'] = json.loads(req.body) return self.application diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index 6b804d3b4..27d174fe9 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -183,7 +183,7 @@ class ServersTest(test.TestCase): new_return_server = return_server_with_addresses(private, public) self.stubs.Set(nova.db.api, 'instance_get', new_return_server) req = webob.Request.blank('/v1.1/servers/1') - req.environ['version'] = '1.1' + req.environ['api.version'] = '1.1' res = req.get_response(fakes.wsgi_app()) res_dict = json.loads(res.body) self.assertEqual(res_dict['server']['id'], '1') @@ -363,7 +363,7 @@ class ServersTest(test.TestCase): def test_get_all_server_details_v1_1(self): req = webob.Request.blank('/v1.1/servers/detail') - req.environ['version'] = '1.1' + req.environ['api.version'] = '1.1' res = req.get_response(fakes.wsgi_app()) res_dict = json.loads(res.body) |