From bd707c476352e83afcd9a228314fa716ab33731e Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 10 Sep 2013 10:40:10 +0100 Subject: [PATCH] Finish what was started in 53abda36 --- tests/integration/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py index abff27ceb5..2f2b85cd99 100644 --- a/tests/integration/__init__.py +++ b/tests/integration/__init__.py @@ -135,6 +135,7 @@ class TestDaemon(object): self.sub_minion_opts = salt.config.minion_config( os.path.join(INTEGRATION_TEST_DIR, 'files', 'conf', 'sub_minion') ) + self.sub_minion_opts['root_dir'] = os.path.join(TMP, 'subsalt') self.sub_minion_opts['user'] = running_tests_user #if sys.version_info < (2, 7): # self.sub_minion_opts['multiprocessing'] = False