diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-25 06:07:26 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-25 07:46:18 +0200 |
commit | 0503756fa4584e82081fb44b9133d2564d77105b (patch) | |
tree | f7986d1271c5a94038afa0783ed48ea5f32797ee /functest/tests/unit/openstack/snaps | |
parent | e905fbe2253bf43da2661c3a9e67429e0292993a (diff) |
Implement connection_check via shade too
SNAPS connection_check tests are merged into api_check.
It would ease debugging deployment as well [1]
[1] https://build.opnfv.org/ci/view/functest/job/functest-apex-baremetal-daily-master/127/console
Change-Id: I30254a46c3dc6874881d687e36903c6b7878d63d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/tests/unit/openstack/snaps')
-rw-r--r-- | functest/tests/unit/openstack/snaps/test_snaps.py | 76 |
1 files changed, 9 insertions, 67 deletions
diff --git a/functest/tests/unit/openstack/snaps/test_snaps.py b/functest/tests/unit/openstack/snaps/test_snaps.py index 9da4f2ac8..a3760445f 100644 --- a/functest/tests/unit/openstack/snaps/test_snaps.py +++ b/functest/tests/unit/openstack/snaps/test_snaps.py @@ -15,73 +15,9 @@ import mock from snaps.openstack.os_credentials import OSCreds from xtesting.core import testcase -from functest.opnfv_tests.openstack.snaps import ( - connection_check, api_check, health_check, smoke) - - -class ConnectionCheckTesting(unittest.TestCase): - """ - Ensures the VPingUserdata class can run in Functest. This test does not - actually connect with an OpenStack pod. - """ - - def setUp(self): - self.os_creds = OSCreds( - username='user', password='pass', - auth_url='http://foo.com:5000/v3', project_name='bar') - - self.connection_check = connection_check.ConnectionCheck( - os_creds=self.os_creds, ext_net_name='foo') - - @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' - 'add_openstack_client_tests') - @mock.patch('unittest.TextTestRunner.run', - return_value=mock.MagicMock(name='unittest.TextTestResult')) - def test_run_success(self, *args): - args[0].return_value.testsRun = 100 - args[0].return_value.failures = [] - args[0].return_value.errors = [] - self.assertEquals(testcase.TestCase.EX_OK, self.connection_check.run()) - self.assertEquals( - testcase.TestCase.EX_OK, self.connection_check.is_successful()) - args[0].assert_called_with(mock.ANY) - args[1].assert_called_with( - ext_net_name='foo', os_creds=self.os_creds, suite=mock.ANY, - use_keystone=True) - - @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' - 'add_openstack_client_tests') - @mock.patch('unittest.TextTestRunner.run', - return_value=mock.MagicMock(name='unittest.TextTestResult')) - def test_run_1_of_100_ko(self, *args): - args[0].return_value.testsRun = 100 - args[0].return_value.failures = ['foo'] - args[0].return_value.errors = [] - self.assertEquals(testcase.TestCase.EX_OK, self.connection_check.run()) - self.assertEquals( - testcase.TestCase.EX_TESTCASE_FAILED, - self.connection_check.is_successful()) - args[0].assert_called_with(mock.ANY) - args[1].assert_called_with( - ext_net_name='foo', os_creds=self.os_creds, suite=mock.ANY, - use_keystone=True) - - @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' - 'add_openstack_client_tests') - @mock.patch('unittest.TextTestRunner.run', - return_value=mock.MagicMock(name='unittest.TextTestResult')) - def test_run_1_of_100_ko_criteria(self, *args): - self.connection_check.criteria = 90 - args[0].return_value.testsRun = 100 - args[0].return_value.failures = ['foo'] - args[0].return_value.errors = [] - self.assertEquals(testcase.TestCase.EX_OK, self.connection_check.run()) - self.assertEquals( - testcase.TestCase.EX_OK, self.connection_check.is_successful()) - args[0].assert_called_with(mock.ANY) - args[1].assert_called_with( - ext_net_name='foo', os_creds=self.os_creds, suite=mock.ANY, - use_keystone=True) +from functest.opnfv_tests.openstack.snaps import api_check +from functest.opnfv_tests.openstack.snaps import health_check +from functest.opnfv_tests.openstack.snaps import smoke class APICheckTesting(unittest.TestCase): @@ -99,6 +35,8 @@ class APICheckTesting(unittest.TestCase): os_creds=self.os_creds, ext_net_name='foo') @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' + 'add_openstack_client_tests') + @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' 'add_openstack_api_tests') @mock.patch('unittest.TextTestRunner.run', return_value=mock.MagicMock(name='unittest.TextTestResult')) @@ -115,6 +53,8 @@ class APICheckTesting(unittest.TestCase): os_creds=self.os_creds, suite=mock.ANY, use_keystone=True) @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' + 'add_openstack_client_tests') + @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' 'add_openstack_api_tests') @mock.patch('unittest.TextTestRunner.run', return_value=mock.MagicMock(name='unittest.TextTestResult')) @@ -132,6 +72,8 @@ class APICheckTesting(unittest.TestCase): os_creds=self.os_creds, suite=mock.ANY, use_keystone=True) @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' + 'add_openstack_client_tests') + @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_suite_builder.' 'add_openstack_api_tests') @mock.patch('unittest.TextTestRunner.run', return_value=mock.MagicMock(name='unittest.TextTestResult')) |