diff --git a/tests/cli/test_stack.py b/tests/cli/1_test_stack.py similarity index 100% rename from tests/cli/test_stack.py rename to tests/cli/1_test_stack.py diff --git a/tests/cli/test_stack_services_start.py b/tests/cli/2_test_stack_services_start.py similarity index 100% rename from tests/cli/test_stack_services_start.py rename to tests/cli/2_test_stack_services_start.py diff --git a/tests/cli/test_stack_services_status.py b/tests/cli/3_test_stack_services_status.py similarity index 100% rename from tests/cli/test_stack_services_status.py rename to tests/cli/3_test_stack_services_status.py diff --git a/tests/cli/test_stack_services_stop.py b/tests/cli/4_test_stack_services_stop.py similarity index 100% rename from tests/cli/test_stack_services_stop.py rename to tests/cli/4_test_stack_services_stop.py diff --git a/tests/cli/test_secure.py b/tests/cli/51_test_secure.py similarity index 100% rename from tests/cli/test_secure.py rename to tests/cli/51_test_secure.py diff --git a/tests/cli/test_clean.py b/tests/cli/52_test_clean.py similarity index 100% rename from tests/cli/test_clean.py rename to tests/cli/52_test_clean.py diff --git a/tests/cli/test_stack_services_restart.py b/tests/cli/5_test_stack_services_restart.py similarity index 100% rename from tests/cli/test_stack_services_restart.py rename to tests/cli/5_test_stack_services_restart.py diff --git a/tests/cli/test_site_create.py b/tests/cli/8_test_site_create.py similarity index 100% rename from tests/cli/test_site_create.py rename to tests/cli/8_test_site_create.py diff --git a/tests/cli/test_site_info.py b/tests/cli/91_test_site_info.py similarity index 100% rename from tests/cli/test_site_info.py rename to tests/cli/91_test_site_info.py diff --git a/tests/cli/test_site_cd.py b/tests/cli/92_test_site_cd.py similarity index 100% rename from tests/cli/test_site_cd.py rename to tests/cli/92_test_site_cd.py diff --git a/tests/cli/test_site_list.py b/tests/cli/93_test_site_list.py similarity index 100% rename from tests/cli/test_site_list.py rename to tests/cli/93_test_site_list.py diff --git a/tests/cli/test_site_edit.py b/tests/cli/94_test_site_edit.py similarity index 100% rename from tests/cli/test_site_edit.py rename to tests/cli/94_test_site_edit.py diff --git a/tests/cli/test_site_show.py b/tests/cli/95_test_site_show.py similarity index 81% rename from tests/cli/test_site_show.py rename to tests/cli/95_test_site_show.py index ba6c4f1f..606578a6 100644 --- a/tests/cli/test_site_show.py +++ b/tests/cli/95_test_site_show.py @@ -10,7 +10,7 @@ class CliTestCaseSite(test.EETestCase): self.app.close() def test_ee_cli_show_edit(self): - self.app = get_test_app(argv=['site', 'show', 'example.com']) + self.app = get_test_app(argv=['site', 'show', 'example1.com']) self.app.setup() self.app.run() self.app.close() diff --git a/tests/cli/test_site_update.py b/tests/cli/97_test_site_update.py similarity index 99% rename from tests/cli/test_site_update.py rename to tests/cli/97_test_site_update.py index 3f46d400..538b5b15 100644 --- a/tests/cli/test_site_update.py +++ b/tests/cli/97_test_site_update.py @@ -10,70 +10,70 @@ class CliTestCaseSite(test.EETestCase): self.app.close() def test_ee_cli_site_update(self): - self.app = get_test_app(argv=['site', 'update', 'example.com', + self.app = get_test_app(argv=['site', 'update', 'example5.com', '--password']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_site_update_html(self): - self.app = get_test_app(argv=['site', 'update', 'example1.com', + self.app = get_test_app(argv=['site', 'update', 'example2.com', '--html']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_site_update_php(self): - self.app = get_test_app(argv=['site', 'update', 'example2.com', + self.app = get_test_app(argv=['site', 'update', 'example3.com', '--php']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_site_update_mysql(self): - self.app = get_test_app(argv=['site', 'update', 'example3.com', + self.app = get_test_app(argv=['site', 'update', 'example4.com', '--mysql']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_site_update_wp(self): - self.app = get_test_app(argv=['site', 'update', 'example4.com', + self.app = get_test_app(argv=['site', 'update', 'example5.com', '--wp']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_site_update_wpsubdir(self): - self.app = get_test_app(argv=['site', 'update', 'example5.com', + self.app = get_test_app(argv=['site', 'update', 'example6.com', '--wpsubdir']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_site_update_wpsubdomain(self): - self.app = get_test_app(argv=['site', 'update', 'example6.com', + self.app = get_test_app(argv=['site', 'update', 'example7.com', '--wpsubdomain']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_site_update_w3tc(self): - self.app = get_test_app(argv=['site', 'update', 'example7.com', + self.app = get_test_app(argv=['site', 'update', 'example8.com', '--w3tc']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_site_update_wpfc(self): - self.app = get_test_app(argv=['site', 'update', 'example8.com', + self.app = get_test_app(argv=['site', 'update', 'example9.com', '--wpfc']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_site_update_wpsc(self): - self.app = get_test_app(argv=['site', 'update', 'example9.com', + self.app = get_test_app(argv=['site', 'update', 'example1.com', '--wpsc']) self.app.setup() self.app.run() diff --git a/tests/cli/test_site_enable.py b/tests/cli/9_test_site_enable.py similarity index 100% rename from tests/cli/test_site_enable.py rename to tests/cli/9_test_site_enable.py diff --git a/tests/cli/test_site_disable.py b/tests/cli/a_test_site_disable.py similarity index 100% rename from tests/cli/test_site_disable.py rename to tests/cli/a_test_site_disable.py diff --git a/tests/cli/test_debug.py b/tests/cli/test_debug.py index 8d02c28e..643b34ec 100644 --- a/tests/cli/test_debug.py +++ b/tests/cli/test_debug.py @@ -77,19 +77,19 @@ class CliTestCaseDebug(test.EETestCase): self.app.close() def test_ee_cli_debug_site_name_start(self): - self.app = get_test_app(argv=['debug', 'example.com', '--start']) + self.app = get_test_app(argv=['debug', 'example1.com', '--start']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_debug_site_name_stop(self): - self.app = get_test_app(argv=['debug', 'example.com', '--stop']) + self.app = get_test_app(argv=['debug', 'example1.com', '--stop']) self.app.setup() self.app.run() self.app.close() def test_ee_cli_debug_site_name_rewrite(self): - self.app = get_test_app(argv=['debug', 'example.com', '--rewrite']) + self.app = get_test_app(argv=['debug', 'example1.com', '--rewrite']) self.app.setup() self.app.run() self.app.close() diff --git a/tests/cli/test_site_log.py b/tests/cli/test_site_log.py deleted file mode 100644 index e73f4c6f..00000000 --- a/tests/cli/test_site_log.py +++ /dev/null @@ -1,16 +0,0 @@ -from ee.utils import test -from ee.cli.main import get_test_app - - -class CliTestCaseSite(test.EETestCase): - - def test_ee_cli(self): - self.app.setup() - self.app.run() - self.app.close() - - def test_ee_cli_site_log(self): - self.app = get_test_app(argv=['site', 'log', 'example1.com']) - self.app.setup() - self.app.run() - self.app.close()