summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-12 14:02:24 +0000
committerGerrit Code Review <review@openstack.org>2016-09-12 14:02:24 +0000
commit65df0af12f3cb86e42823d5fae737129cb533afe (patch)
tree14041dff1b72962c9810db88d07b001b387579b3
parent20a3239c6c89b839d8921d4f6915219bc1d3a8c0 (diff)
parent757d5e609d3e6be8c6a689e476f2feebbef6ae67 (diff)
Merge "TrivialFix: Remove cfg import unused"3.0.0.0rc1
-rw-r--r--muranoagent/tests/unit/executors/test_chef.py3
-rw-r--r--muranoagent/tests/unit/executors/test_puppet.py3
2 files changed, 0 insertions, 6 deletions
diff --git a/muranoagent/tests/unit/executors/test_chef.py b/muranoagent/tests/unit/executors/test_chef.py
index 1cecc64..cfdb63a 100644
--- a/muranoagent/tests/unit/executors/test_chef.py
+++ b/muranoagent/tests/unit/executors/test_chef.py
@@ -19,14 +19,11 @@ from mock import ANY
19import os 19import os
20 20
21from muranoagent import bunch 21from muranoagent import bunch
22from muranoagent.common import config as cfg
23from muranoagent import exceptions as ex 22from muranoagent import exceptions as ex
24from muranoagent.executors import chef 23from muranoagent.executors import chef
25from muranoagent.tests.unit import base 24from muranoagent.tests.unit import base
26from muranoagent.tests.unit import execution_plan as ep 25from muranoagent.tests.unit import execution_plan as ep
27 26
28CONF = cfg.CONF
29
30 27
31class TestChefExecutor(base.MuranoAgentTestCase, fixtures.TestWithFixtures): 28class TestChefExecutor(base.MuranoAgentTestCase, fixtures.TestWithFixtures):
32 def setUp(self): 29 def setUp(self):
diff --git a/muranoagent/tests/unit/executors/test_puppet.py b/muranoagent/tests/unit/executors/test_puppet.py
index 43af339..69aba24 100644
--- a/muranoagent/tests/unit/executors/test_puppet.py
+++ b/muranoagent/tests/unit/executors/test_puppet.py
@@ -16,14 +16,11 @@ import fixtures
16import mock 16import mock
17 17
18from muranoagent import bunch 18from muranoagent import bunch
19from muranoagent.common import config as cfg
20from muranoagent import exceptions as ex 19from muranoagent import exceptions as ex
21from muranoagent.executors import puppet 20from muranoagent.executors import puppet
22from muranoagent.tests.unit import base 21from muranoagent.tests.unit import base
23from muranoagent.tests.unit import execution_plan as ep 22from muranoagent.tests.unit import execution_plan as ep
24 23
25CONF = cfg.CONF
26
27 24
28class TestPuppetExecutor(base.MuranoAgentTestCase, fixtures.TestWithFixtures): 25class TestPuppetExecutor(base.MuranoAgentTestCase, fixtures.TestWithFixtures):
29 def setUp(self): 26 def setUp(self):