Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add support for Rally OpenStack CI test cases
[functest.git]
/
functest
/
tests
/
unit
/
openstack
/
rally
/
test_rally.py
diff --git
a/functest/tests/unit/openstack/rally/test_rally.py
b/functest/tests/unit/openstack/rally/test_rally.py
index
d89ebd6
..
22ddb1c
100644
(file)
--- a/
functest/tests/unit/openstack/rally/test_rally.py
+++ b/
functest/tests/unit/openstack/rally/test_rally.py
@@
-71,7
+71,7
@@
class OSRallyTesting(unittest.TestCase):
@mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists')
@mock.patch('functest.opnfv_tests.openstack.rally.rally.os.makedirs')
@mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
@mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists')
@mock.patch('functest.opnfv_tests.openstack.rally.rally.os.makedirs')
@mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
- '
_
apply_blacklist')
+ 'apply_blacklist')
def test_prepare_test_list_missing_temp_dir(
self, mock_method, mock_os_makedirs, mock_path_exists):
mock_path_exists.side_effect = self.check_temp_dir
def test_prepare_test_list_missing_temp_dir(
self, mock_method, mock_os_makedirs, mock_path_exists):
mock_path_exists.side_effect = self.check_temp_dir
@@
-153,10
+153,13
@@
class OSRallyTesting(unittest.TestCase):
{'functions': ['no_migration'], 'tests': ['test']}]})
@mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
'_migration_supported', return_value=False)
{'functions': ['no_migration'], 'tests': ['test']}]})
@mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
'_migration_supported', return_value=False)
- def test_excl_func_default(self, mock_func, mock_yaml_load):
+ @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+ '_network_trunk_supported', return_value=False)
+ def test_excl_func_default(self, mock_trunk, mock_func, mock_yaml_load):
os.environ['DEPLOY_SCENARIO'] = 'test_scenario'
self.assertEqual(self.rally_base.excl_func(), ['test'])
mock_func.assert_called()
os.environ['DEPLOY_SCENARIO'] = 'test_scenario'
self.assertEqual(self.rally_base.excl_func(), ['test'])
mock_func.assert_called()
+ mock_trunk.assert_called()
mock_yaml_load.assert_called()
@mock.patch('six.moves.builtins.open', side_effect=Exception)
mock_yaml_load.assert_called()
@mock.patch('six.moves.builtins.open', side_effect=Exception)
@@
-263,8
+266,7
@@
class OSRallyTesting(unittest.TestCase):
with self.assertRaises(Exception):
self.rally_base.prepare_run()
with self.assertRaises(Exception):
self.rally_base.prepare_run()
- @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
- 'get_external_network')
+ @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists')
def test_prepare_run_flavor_alt_creation_failed(self, *args):
# pylint: disable=unused-argument
self.rally_base.TESTS = ['test1', 'test2']
def test_prepare_run_flavor_alt_creation_failed(self, *args):
# pylint: disable=unused-argument
self.rally_base.TESTS = ['test1', 'test2']