openstack/murano
Code Issues Proposed changes

Refactor murano functional tests

Browse Source 
Change-Id: I5f60d47bea135e25a5cee022187f499bf177439c
This commit is contained in:
Sergey Murashov 2014-04-01 17:48:51 +04:00 committed by Gerrit Code Review
parent d591d98b5e
commit fe627d1bbb
4 changed files with 67 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functionaltests/api/base.py
View File

@ -201,6 +201,12 @@ class TestCase(testtools.TestCase):
except exceptions.NotFound:
pass
def create_environment(self, name):
environment = self.client.create_environment(name)[1]
self.environments.append(environment)
return environment
def create_demo_service(self, environment_id, session_id):
post_body = {
"?": {

18
functionaltests/api/v1/test_envs.py
View File

@ -29,7 +29,7 @@ class TestEnvironments(base.TestCase):
@attr(type='smoke')
def test_create_and_delete_environment(self):
_, environments_list_start = self.client.get_environments_list()
environments_list_start = self.client.get_environments_list()[1]
resp, env = self.client.create_environment('test')
self.environments.append(env)
@ -37,14 +37,14 @@ class TestEnvironments(base.TestCase):
self.assertEqual(resp.status, 200)
self.assertEqual('test', env['name'])
_, environments_list = self.client.get_environments_list()
environments_list = self.client.get_environments_list()[1]
self.assertEqual(len(environments_list_start['environments']) + 1,
len(environments_list['environments']))
self.client.delete_environment(env['id'])
_, environments_list = self.client.get_environments_list()
environments_list = self.client.get_environments_list()[1]
self.assertEqual(len(environments_list_start['environments']),
len(environments_list['environments']))
@ -53,8 +53,7 @@ class TestEnvironments(base.TestCase):
@attr(type='smoke')
def test_get_environment(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
resp, environment = self.client.get_environment(env['id'])
@ -63,8 +62,7 @@ class TestEnvironments(base.TestCase):
@attr(type='smoke')
def test_update_environment(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
resp, environment = self.client.update_environment(env['id'])
@ -85,8 +83,7 @@ class TestEnvironments(base.TestCase):
@attr(type='negative')
def test_double_delete_environment(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
self.client.delete_environment(env['id'])
@ -96,8 +93,7 @@ class TestEnvironments(base.TestCase):
@attr(type='negative')
def test_get_deleted_environment(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
self.client.delete_environment(env['id'])

93
functionaltests/api/v1/test_services.py
View File

@ -24,10 +24,9 @@ class TestServices(base.TestCase):
@attr(type='smoke')
def test_get_services_list(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
resp, services_list = self.client.get_services_list(env['id'],
sess['id'])
@ -37,10 +36,9 @@ class TestServices(base.TestCase):
@attr(type='negative')
def test_get_services_list_without_env_id(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
self.assertRaises(exceptions.NotFound,
self.client.get_services_list,
@ -49,10 +47,9 @@ class TestServices(base.TestCase):
@attr(type='negative')
def test_get_services_list_after_delete_env(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
self.client.delete_environment(env['id'])
@ -63,10 +60,9 @@ class TestServices(base.TestCase):
@attr(type='negative')
def test_get_services_list_after_delete_session(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
self.client.delete_session(env['id'], sess['id'])
@ -77,37 +73,35 @@ class TestServices(base.TestCase):
@attr(type='smoke')
def test_create_and_delete_demo_service(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
_, services_list = self.client.get_services_list(env['id'], sess['id'])
services_list = self.client.get_services_list(env['id'], sess['id'])[1]
resp, service = self.create_demo_service(env['id'], sess['id'])
_, services_list_ = self.client.get_services_list(env['id'],
sess['id'])
services_list_ = self.client.get_services_list(env['id'],
sess['id'])[1]
self.assertEqual(resp.status, 200)
self.assertEqual(len(services_list) + 1, len(services_list_))
resp, _ = self.client.delete_service(env['id'],
sess['id'],
service['?']['id'])
resp = self.client.delete_service(env['id'],
sess['id'],
service['?']['id'])[0]
_, services_list_ = self.client.get_services_list(env['id'],
sess['id'])
services_list_ = self.client.get_services_list(env['id'],
sess['id'])[1]
self.assertEqual(resp.status, 200)
self.assertEqual(len(services_list), len(services_list_))
@attr(type='negative')
def test_create_demo_service_without_env_id(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
self.assertRaises(exceptions.NotFound,
self.create_demo_service,
@ -116,10 +110,9 @@ class TestServices(base.TestCase):
@attr(type='negative')
def test_create_demo_service_without_sess_id(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
self.client.create_session(env['id'])
self.assertRaises(exceptions.Unauthorized,
self.create_demo_service,
@ -128,12 +121,11 @@ class TestServices(base.TestCase):
@attr(type='negative')
def test_delete_demo_service_without_env_id(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
_, service = self.create_demo_service(env['id'], sess['id'])
service = self.create_demo_service(env['id'], sess['id'])[1]
self.assertRaises(exceptions.NotFound,
self.client.delete_service,
@ -143,12 +135,11 @@ class TestServices(base.TestCase):
@attr(type='negative')
def test_delete_demo_service_without_session_id(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
_, service = self.create_demo_service(env['id'], sess['id'])
service = self.create_demo_service(env['id'], sess['id'])[1]
self.assertRaises(exceptions.Unauthorized,
self.client.delete_service,
@ -158,12 +149,11 @@ class TestServices(base.TestCase):
@attr(type='negative')
def test_double_delete_service(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
_, service = self.create_demo_service(env['id'], sess['id'])
service = self.create_demo_service(env['id'], sess['id'])[1]
self.client.delete_service(env['id'], sess['id'], service['?']['id'])
@ -175,12 +165,11 @@ class TestServices(base.TestCase):
@attr(type='smoke')
def test_get_service(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
_, service = self.create_demo_service(env['id'], sess['id'])
service = self.create_demo_service(env['id'], sess['id'])[1]
resp, service_ = self.client.get_service(env['id'],
sess['id'],
@ -191,12 +180,11 @@ class TestServices(base.TestCase):
@attr(type='negative')
def test_get_service_without_env_id(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
_, service = self.create_demo_service(env['id'], sess['id'])
service = self.create_demo_service(env['id'], sess['id'])[1]
self.assertRaises(exceptions.NotFound,
self.client.get_service,
@ -207,12 +195,11 @@ class TestServices(base.TestCase):
@testtools.skip("https://bugs.launchpad.net/murano/+bug/1295573")
@attr(type='negative')
def test_get_service_without_sess_id(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
_, service = self.create_demo_service(env['id'], sess['id'])
service = self.create_demo_service(env['id'], sess['id'])[1]
self.assertRaises(exceptions.Unauthorized,
self.client.get_service,

35
functionaltests/api/v1/test_sessions.py
View File

@ -22,8 +22,7 @@ class TestSessions(base.TestCase):
@attr(type='smoke')
def test_create_session(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
resp, sess = self.client.create_session(env['id'])
@ -38,21 +37,19 @@ class TestSessions(base.TestCase):
@attr(type='smoke')
def test_delete_session(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
resp, _ = self.client.delete_session(env['id'], sess['id'])
resp = self.client.delete_session(env['id'], sess['id'])[0]
self.assertEqual(resp.status, 200)
@attr(type='negative')
def test_delete_session_without_env_id(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
self.assertRaises(exceptions.NotFound,
self.client.delete_session,
@ -61,10 +58,9 @@ class TestSessions(base.TestCase):
@attr(type='smoke')
def test_get_session(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
resp, session = self.client.get_session(env['id'], sess['id'])
@ -73,10 +69,9 @@ class TestSessions(base.TestCase):
@attr(type='negative')
def test_get_session_without_env_id(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
self.assertRaises(exceptions.NotFound,
self.client.get_session,
@ -85,10 +80,9 @@ class TestSessions(base.TestCase):
@attr(type='negative')
def test_get_session_after_delete_env(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
self.client.delete_environment(env['id'])
@ -99,10 +93,9 @@ class TestSessions(base.TestCase):
@attr(type='negative')
def test_double_delete_session(self):
_, env = self.client.create_environment('test')
self.environments.append(env)
env = self.create_environment('test')
_, sess = self.client.create_session(env['id'])
sess = self.client.create_session(env['id'])[1]
self.client.delete_session(env['id'], sess['id'])