From 6711d68ef1162d7344b6af9ee8f540a87ea58310 Mon Sep 17 00:00:00 2001 From: Sunil Shah Date: Sun, 5 Apr 2015 18:03:01 -0700 Subject: [PATCH 1/2] Goodbye, --all --- cli/dcoscli/help/main.py | 2 -- cli/dcoscli/main.py | 2 +- cli/tests/integrations/cli/test_help.py | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cli/dcoscli/help/main.py b/cli/dcoscli/help/main.py index 8b78d37..6cf0bd1 100644 --- a/cli/dcoscli/help/main.py +++ b/cli/dcoscli/help/main.py @@ -2,13 +2,11 @@ Usage: dcos help - dcos help --all dcos help info Options: --help Show this screen --version Show version - --all Prints all available commands to the standard output """ import dcoscli import docopt diff --git a/cli/dcoscli/main.py b/cli/dcoscli/main.py index 3eb666d..be44310 100644 --- a/cli/dcoscli/main.py +++ b/cli/dcoscli/main.py @@ -22,7 +22,7 @@ Environment Variables: DCOS_CONFIG This environment variable points to the location of the DCOS configuration file. -'dcos help --all' lists all available subcommands. See 'dcos --help' +'dcos help' lists all available subcommands. See 'dcos --help' to read about a specific subcommand. """ diff --git a/cli/tests/integrations/cli/test_help.py b/cli/tests/integrations/cli/test_help.py index 5f0c449..c5208bb 100644 --- a/cli/tests/integrations/cli/test_help.py +++ b/cli/tests/integrations/cli/test_help.py @@ -13,13 +13,11 @@ def test_help(): Usage: dcos help - dcos help --all dcos help info Options: --help Show this screen --version Show version - --all Prints all available commands to the standard output """ assert stderr == b'' From 2b0cf896612e5858ddcbdc19bbef50c717149231 Mon Sep 17 00:00:00 2001 From: Sunil Shah Date: Sun, 5 Apr 2015 23:51:06 -0700 Subject: [PATCH 2/2] Fix tests --- cli/tests/integrations/cli/test_dcos.py | 2 +- cli/tests/integrations/cli/test_help.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/tests/integrations/cli/test_dcos.py b/cli/tests/integrations/cli/test_dcos.py index 847ba86..c732391 100644 --- a/cli/tests/integrations/cli/test_dcos.py +++ b/cli/tests/integrations/cli/test_dcos.py @@ -32,7 +32,7 @@ Environment Variables: DCOS_CONFIG This environment variable points to the location of the DCOS configuration file. -'dcos help --all' lists all available subcommands. See 'dcos --help' +'dcos help' lists all available subcommands. See 'dcos --help' to read about a specific subcommand. """ assert stderr == b'' diff --git a/cli/tests/integrations/cli/test_help.py b/cli/tests/integrations/cli/test_help.py index c5208bb..12213c3 100644 --- a/cli/tests/integrations/cli/test_help.py +++ b/cli/tests/integrations/cli/test_help.py @@ -38,9 +38,9 @@ def test_version(): assert stderr == b'' -def test_list_all(): +def test_list(): dcos_path = os.path.dirname(os.path.dirname(util.which('dcos'))) - returncode, stdout, stderr = exec_command(['dcos', 'help', '--all']) + returncode, stdout, stderr = exec_command(['dcos', 'help']) assert returncode == 0 assert stdout == """Command line utility for \