From 2c8bed26dd8b5f31f4970b5c61d756d239d4a475 Mon Sep 17 00:00:00 2001 From: shreyas Date: Thu, 21 Apr 2016 14:18:44 +0530 Subject: [PATCH 1/2] [Fix] Fixed drop site test case --- bench/tests/test_init.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bench/tests/test_init.py b/bench/tests/test_init.py index 9df5b17f..e84b80b4 100644 --- a/bench/tests/test_init.py +++ b/bench/tests/test_init.py @@ -57,11 +57,10 @@ class TestBenchInit(unittest.TestCase): }) def test_new_site(self): + self.test_init() self.new_site("test-site-1.dev") def new_site(self, site_name): - self.test_init() - new_site_cmd = ["bench", "new-site", site_name, "--admin-password", "admin"] # set in travis @@ -117,7 +116,7 @@ class TestBenchInit(unittest.TestCase): # Check with archive_path given to drop-site command home = os.path.abspath(os.path.expanduser('~')) - archive_path = os.path.join(home, 'archived_sites') + archived_sites_path = os.path.join(home, 'archived_sites') self.drop_site("test-drop-with-archive-path", archived_sites_path=archived_sites_path) From 08fbc201c6d8d269aed177447a72f5cb9a61d9b1 Mon Sep 17 00:00:00 2001 From: shreyas Date: Thu, 21 Apr 2016 16:36:04 +0530 Subject: [PATCH 2/2] [Minor] Fix test case for drop-site command --- bench/tests/test_init.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bench/tests/test_init.py b/bench/tests/test_init.py index e84b80b4..0416b08c 100644 --- a/bench/tests/test_init.py +++ b/bench/tests/test_init.py @@ -57,7 +57,7 @@ class TestBenchInit(unittest.TestCase): }) def test_new_site(self): - self.test_init() + self.init_bench('test-bench') self.new_site("test-site-1.dev") def new_site(self, site_name): @@ -88,6 +88,7 @@ class TestBenchInit(unittest.TestCase): def test_install_app(self): site_name = "test-site-2.dev" + self.init_bench('test-bench') self.new_site(site_name) bench_path = os.path.join(self.benches_path, "test-bench") @@ -111,6 +112,7 @@ class TestBenchInit(unittest.TestCase): bench.utils.init(bench_name) def test_drop_site(self): + self.init_bench('test-bench') # Check without archive_path given to drop-site command self.drop_site("test-drop-without-archive-path") @@ -144,7 +146,7 @@ class TestBenchInit(unittest.TestCase): else: self.assertTrue(os.path.exists(archived_sites_path)) - self.assertTrue(os.path.exists(os.path.join(archive_path, site_name))) + self.assertTrue(os.path.exists(os.path.join(archived_sites_path, site_name))) def assert_folders(self, bench_name): for folder in bench.utils.folders_in_bench: