diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-24 16:33:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-24 16:33:03 +0000 |
| commit | 278a1a9bc7cd76e77c8a3cb207720d948b045c61 (patch) | |
| tree | a7de2e139f6fb814d605739581a2ff0b5cbd83c9 | |
| parent | c91d73074aa204b9ff20649ce5a499c87099009f (diff) | |
| parent | c09711d0e2dba0fa0326b5027234e9c4a81e9aac (diff) | |
| download | nova-278a1a9bc7cd76e77c8a3cb207720d948b045c61.tar.gz nova-278a1a9bc7cd76e77c8a3cb207720d948b045c61.tar.xz nova-278a1a9bc7cd76e77c8a3cb207720d948b045c61.zip | |
Merge "Cleanup overshadowing in test_evacuate.py"
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_evacuate.py | 20 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_evacuate.py b/nova/tests/api/openstack/compute/contrib/test_evacuate.py index 816bac565..f2ebf9d78 100644 --- a/nova/tests/api/openstack/compute/contrib/test_evacuate.py +++ b/nova/tests/api/openstack/compute/contrib/test_evacuate.py @@ -76,8 +76,8 @@ class EvacuateTest(test.TestCase): ctxt.project_id = 'fake' ctxt.is_admin = True app = fakes.wsgi_app(fake_auth_context=ctxt) - uuid = self.UUID - req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid) + uuid1 = self.UUID + req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1) req.method = 'POST' req.body = jsonutils.dumps({ 'evacuate': { @@ -105,8 +105,8 @@ class EvacuateTest(test.TestCase): ctxt.project_id = 'fake' ctxt.is_admin = True app = fakes.wsgi_app(fake_auth_context=ctxt) - uuid = self.UUID - req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid) + uuid1 = self.UUID + req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1) req.method = 'POST' req.body = jsonutils.dumps({ 'evacuate': { @@ -132,8 +132,8 @@ class EvacuateTest(test.TestCase): ctxt.project_id = 'fake' ctxt.is_admin = True app = fakes.wsgi_app(fake_auth_context=ctxt) - uuid = self.UUID - req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid) + uuid1 = self.UUID + req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1) req.method = 'POST' req.body = jsonutils.dumps({ 'evacuate': { @@ -161,8 +161,8 @@ class EvacuateTest(test.TestCase): ctxt.project_id = 'fake' ctxt.is_admin = True app = fakes.wsgi_app(fake_auth_context=ctxt) - uuid = self.UUID - req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid) + uuid1 = self.UUID + req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1) req.method = 'POST' req.body = jsonutils.dumps({ 'evacuate': { @@ -184,8 +184,8 @@ class EvacuateTest(test.TestCase): def test_not_admin(self): ctxt = context.RequestContext('fake', 'fake', is_admin=False) app = fakes.wsgi_app(fake_auth_context=ctxt) - uuid = self.UUID - req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid) + uuid1 = self.UUID + req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1) req.method = 'POST' req.body = jsonutils.dumps({ 'evacuate': { diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py b/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py index a9ad80ea5..72a531277 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py @@ -76,8 +76,8 @@ class EvacuateTest(test.TestCase): ctxt.project_id = 'fake' ctxt.is_admin = True app = fakes.wsgi_app_v3(fake_auth_context=ctxt) - uuid = self.UUID - req = webob.Request.blank('/v3/servers/%s/action' % uuid) + uuid1 = self.UUID + req = webob.Request.blank('/v3/servers/%s/action' % uuid1) req.method = 'POST' req.body = jsonutils.dumps({ 'evacuate': { @@ -105,8 +105,8 @@ class EvacuateTest(test.TestCase): ctxt.project_id = 'fake' ctxt.is_admin = True app = fakes.wsgi_app_v3(fake_auth_context=ctxt) - uuid = self.UUID - req = webob.Request.blank('/v3/servers/%s/action' % uuid) + uuid1 = self.UUID + req = webob.Request.blank('/v3/servers/%s/action' % uuid1) req.method = 'POST' req.body = jsonutils.dumps({ 'evacuate': { @@ -132,8 +132,8 @@ class EvacuateTest(test.TestCase): ctxt.project_id = 'fake' ctxt.is_admin = True app = fakes.wsgi_app_v3(fake_auth_context=ctxt) - uuid = self.UUID - req = webob.Request.blank('/v3/servers/%s/action' % uuid) + uuid1 = self.UUID + req = webob.Request.blank('/v3/servers/%s/action' % uuid1) req.method = 'POST' req.body = jsonutils.dumps({ 'evacuate': { @@ -161,8 +161,8 @@ class EvacuateTest(test.TestCase): ctxt.project_id = 'fake' ctxt.is_admin = True app = fakes.wsgi_app_v3(fake_auth_context=ctxt) - uuid = self.UUID - req = webob.Request.blank('/v3/servers/%s/action' % uuid) + uuid1 = self.UUID + req = webob.Request.blank('/v3/servers/%s/action' % uuid1) req.method = 'POST' req.body = jsonutils.dumps({ 'evacuate': { @@ -184,8 +184,8 @@ class EvacuateTest(test.TestCase): def test_not_admin(self): ctxt = context.RequestContext('fake', 'fake', is_admin=False) app = fakes.wsgi_app_v3(fake_auth_context=ctxt) - uuid = self.UUID - req = webob.Request.blank('/v3/servers/%s/action' % uuid) + uuid1 = self.UUID + req = webob.Request.blank('/v3/servers/%s/action' % uuid1) req.method = 'POST' req.body = jsonutils.dumps({ 'evacuate': { |