openstack/rally
Code Issues Proposed changes

Remove duplicate mocks from ScenarioTestCase

Browse Source 
Blueprint unit-tests-refactoring

Change-Id: Ib39620e55edb950609f10491480df14c9be6e2c7
This commit is contained in:
Mikhail Dubov
2013-12-26 15:16:33 +04:00
parent efb508b726
commit fafd97cfce
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/benchmark/test_runner.py
View File

@@ -241,10 +241,9 @@ class ScenarioTestCase(test.TestCase):
expected = [mock.call(period * 60) for i in xrange(times - 1)]
mock_sleep.has_calls(expected)
@mock.patch("rally.benchmark.utils.osclients")
@mock.patch("rally.benchmark.runner.base")
@mock.patch("rally.benchmark.utils.osclients")
def test_run_continuous(self, mock_osclients, mock_base, mock_clients):
def test_run_continuous(self, mock_osclients, mock_base):
FakeScenario = mock.MagicMock()
FakeScenario.init = mock.MagicMock(return_value={})
@@ -260,7 +259,7 @@ class ScenarioTestCase(test.TestCase):
mock_base.Scenario.get_by_name = \
mock.MagicMock(return_value=FakeScenario)
mock_clients.return_value = ["client"]
mock_osclients.return_value = ["client"]
result = srunner._run_scenario(FakeScenario, "do_it", {"a": 1},
"continuous", {"times": 2,
"active_users": 3,
@@ -276,10 +275,9 @@ class ScenarioTestCase(test.TestCase):
srunner._run_scenario_continuously_for_duration.\
assert_called_once_with(FakeScenario, "do_it", {"a": 1}, 2, 3, 1)
@mock.patch("rally.benchmark.utils.osclients")
@mock.patch("rally.benchmark.runner.base")
@mock.patch("rally.benchmark.utils.osclients")
def test_run_periodic(self, mock_osclients, mock_base, mock_clients):
def test_run_periodic(self, mock_osclients, mock_base):
FakeScenario = mock.MagicMock()
FakeScenario.init = mock.MagicMock(return_value={})
@@ -293,7 +291,7 @@ class ScenarioTestCase(test.TestCase):
mock_base.Scenario.get_by_name = \
mock.MagicMock(return_value=FakeScenario)
mock_clients.return_value = ["client"]
mock_osclients.return_value = ["client"]
result = srunner._run_scenario(FakeScenario, "do_it", {"a": 1},
"periodic", {"times": 2, "period": 3,
"timeout": 1})