From c65c7f7447d5862fdd52df86d79eb5c58e3fb69d Mon Sep 17 00:00:00 2001 From: Alexander Maretskiy Date: Tue, 6 Sep 2016 16:32:41 +0300 Subject: [PATCH] [Plugins] Remove deprecated Dummy.dummy_with_scenario_output This workload is deprecated and actually does nothing (since return value is not processed anymore). Change-Id: If0f9c24f8237b55b999ad51874c72b48a6899e64 --- rally-jobs/rally-keystone-api-v2.yaml | 10 --------- rally-jobs/rally.yaml | 10 --------- rally/plugins/common/scenarios/dummy/dummy.py | 21 ------------------- .../dummy/dummy-with-scenario-output.json | 17 --------------- .../dummy/dummy-with-scenario-output.yaml | 11 ---------- tests/functional/test_cli_plugin.py | 9 -------- .../common/scenarios/dummy/test_dummy.py | 8 ------- 7 files changed, 86 deletions(-) delete mode 100644 samples/tasks/scenarios/dummy/dummy-with-scenario-output.json delete mode 100644 samples/tasks/scenarios/dummy/dummy-with-scenario-output.yaml diff --git a/rally-jobs/rally-keystone-api-v2.yaml b/rally-jobs/rally-keystone-api-v2.yaml index ed94e27077..0bf7ef3ca5 100644 --- a/rally-jobs/rally-keystone-api-v2.yaml +++ b/rally-jobs/rally-keystone-api-v2.yaml @@ -599,16 +599,6 @@ failure_rate: max: 0 - Dummy.dummy_with_scenario_output: - - - runner: - type: "constant" - times: 20 - concurrency: 10 - sla: - failure_rate: - max: 0 - Dummy.dummy_random_fail_in_atomic: - args: diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml index 7117dc31a7..42f409fccb 100644 --- a/rally-jobs/rally.yaml +++ b/rally-jobs/rally.yaml @@ -631,16 +631,6 @@ failure_rate: max: 0 - Dummy.dummy_with_scenario_output: - - - runner: - type: "constant" - times: 20 - concurrency: 10 - sla: - failure_rate: - max: 0 - Dummy.dummy_random_fail_in_atomic: - args: diff --git a/rally/plugins/common/scenarios/dummy/dummy.py b/rally/plugins/common/scenarios/dummy/dummy.py index f64ee8647d..60112450f3 100644 --- a/rally/plugins/common/scenarios/dummy/dummy.py +++ b/rally/plugins/common/scenarios/dummy/dummy.py @@ -13,7 +13,6 @@ import random from rally.common.i18n import _ -from rally.common import logging from rally.common import utils from rally import exceptions from rally.task import atomic @@ -182,26 +181,6 @@ class DummyOutput(scenario.Scenario): "data": data}) -@logging.log_deprecated("Use Dummy.dummy_output() instead.", "0.4.1", - once=True) -@scenario.configure(name="Dummy.dummy_with_scenario_output") -class DummyWithScenarioOutput(scenario.Scenario): - """Dummy benchmarks for testing Rally benchmark engine.""" - - def run(self): - """Return a dummy scenario output. - - Dummy.dummy_with_scenario_output can be used to test the scenario - output processing. - """ - out = { - "value_1": random.randint(1, 100), - "value_2": random.random() - } - err = "" - return {"data": out, "errors": err} - - @scenario.configure(name="Dummy.dummy_random_fail_in_atomic") class DummyRandomFailInAtomic(scenario.Scenario): """Randomly throw exceptions in atomic actions.""" diff --git a/samples/tasks/scenarios/dummy/dummy-with-scenario-output.json b/samples/tasks/scenarios/dummy/dummy-with-scenario-output.json deleted file mode 100644 index 2bc6c92d69..0000000000 --- a/samples/tasks/scenarios/dummy/dummy-with-scenario-output.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "Dummy.dummy_with_scenario_output": [ - { - "runner": { - "type": "constant", - "times": 20, - "concurrency": 10 - }, - "context": { - "users": { - "tenants": 1, - "users_per_tenant": 1 - } - } - } - ] -} diff --git a/samples/tasks/scenarios/dummy/dummy-with-scenario-output.yaml b/samples/tasks/scenarios/dummy/dummy-with-scenario-output.yaml deleted file mode 100644 index fa8c210d22..0000000000 --- a/samples/tasks/scenarios/dummy/dummy-with-scenario-output.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- - Dummy.dummy_with_scenario_output: - - - runner: - type: "constant" - times: 20 - concurrency: 10 - context: - users: - tenants: 1 - users_per_tenant: 1 diff --git a/tests/functional/test_cli_plugin.py b/tests/functional/test_cli_plugin.py index 04f72a9269..2980e5978d 100644 --- a/tests/functional/test_cli_plugin.py +++ b/tests/functional/test_cli_plugin.py @@ -25,13 +25,6 @@ class PluginTestCase(unittest.TestCase): self.rally = utils.Rally() def test_show_one(self): - result = self.rally("plugin show Dummy.dummy_with_scenario_output") - self.assertIn("NAME", result) - self.assertIn("NAMESPACE", result) - self.assertIn("Dummy.dummy_with_scenario_output", result) - self.assertIn("MODULE", result) - - def test_show_multiple_and_full_match(self): result = self.rally("plugin show Dummy.dummy") self.assertIn("NAME", result) self.assertIn("NAMESPACE", result) @@ -43,7 +36,6 @@ class PluginTestCase(unittest.TestCase): self.assertIn("Multiple plugins found:", result) self.assertIn("Dummy.dummy", result) self.assertIn("Dummy.dummy_exception", result) - self.assertIn("Dummy.dummy_with_scenario_output", result) self.assertIn("Dummy.dummy_random_fail_in_atomic", result) def test_show_not_found(self): @@ -66,7 +58,6 @@ class PluginTestCase(unittest.TestCase): result = self.rally("plugin list Dummy") self.assertIn("Dummy.dummy", result) self.assertIn("Dummy.dummy_exception", result) - self.assertIn("Dummy.dummy_with_scenario_output", result) self.assertIn("Dummy.dummy_random_fail_in_atomic", result) def test_list_not_found_namespace(self): diff --git a/tests/unit/plugins/common/scenarios/dummy/test_dummy.py b/tests/unit/plugins/common/scenarios/dummy/test_dummy.py index bdb20a0079..aff17904b6 100644 --- a/tests/unit/plugins/common/scenarios/dummy/test_dummy.py +++ b/tests/unit/plugins/common/scenarios/dummy/test_dummy.py @@ -155,14 +155,6 @@ class DummyTestCase(test.TestCase): self.assertEqual(expected, scenario._output) - def test_dummy_dummy_with_scenario_output(self): - scenario = dummy.DummyWithScenarioOutput(test.get_test_context()) - result = scenario.run() - self.assertEqual(result["errors"], "") - # Since the data is generated in random, - # checking for not None - self.assertIsNotNone(result["data"]) - def test_dummy_random_fail_in_atomic(self): scenario = dummy.DummyRandomFailInAtomic(test.get_test_context())