Makes code compatible with changes introduced to CliRunner and handling of of exit code for no_args_is_help in Click 8.2.0

Author: filiplajszczak

requirements.txt

@@ -1,5 +1,5 @@
 python-dateutil==2.9.0.post0
-click==8.1.7
+click==8.3.0
 docopt==0.6.2
 importlib-metadata==8.7.0
 packaging

tests/test_cli_django.py

@@ -38,8 +38,8 @@ def test_main_subcommand_without_args_prints_help():
         app,
         [],
     )
-    assert result.exit_code == 0
-    assert "Show this message and exit." in result.stdout
+    assert result.exit_code == 2
+    assert "Show this message and exit." in result.stderr
 
 
 def test_autoconfigure_calls_all_stuff_in_right_order(mock_django_project):

tests/test_cli_pa.py

@@ -14,11 +14,11 @@ def test_main_command_without_args_prints_help():
         app,
         [],
     )
-    assert result.exit_code == 0
-    assert "This is a new experimental PythonAnywhere cli client." in result.stdout
-    assert "Makes Django Girls tutorial projects deployment easy" in result.stdout
-    assert "Perform some operations on files" in result.stdout
-    assert "Manage scheduled tasks" in result.stdout
-    assert "Perform some operations on students" in result.stdout
-    assert "Everything for web apps: use this if you're not using" in result.stdout
-    assert "EXPERIMENTAL: create and manage ASGI websites" in result.stdout
+    assert result.exit_code == 2
+    assert "This is a new experimental PythonAnywhere cli client." in result.stderr
+    assert "Makes Django Girls tutorial projects deployment easy" in result.stderr
+    assert "Perform some operations on files" in result.stderr
+    assert "Manage scheduled tasks" in result.stderr
+    assert "Perform some operations on students" in result.stderr
+    assert "Everything for web apps: use this if you're not using" in result.stderr
+    assert "EXPERIMENTAL: create and manage ASGI websites" in result.stderr

tests/test_cli_path.py

@@ -46,8 +46,8 @@ def test_main_subcommand_without_args_prints_help():
         app,
         [],
     )
-    assert result.exit_code == 0
-    assert "Show this message and exit." in result.stdout
+    assert result.exit_code == 2
+    assert "Show this message and exit." in result.stderr
 
 
 class TestGet:

tests/test_cli_schedule.py

@@ -45,8 +45,8 @@ def test_main_subcommand_without_args_prints_help():
         app,
         [],
     )
-    assert result.exit_code == 0
-    assert "Show this message and exit." in result.stdout
+    assert result.exit_code == 2
+    assert "Show this message and exit." in result.stderr
 
 
 class TestSet:
@@ -78,13 +78,13 @@ def test_calls_all_stuff_in_right_order(self, mocker):
     def test_validates_minutes(self):
         result = runner.invoke(app, ["set", "-c", "echo foo", "-h", "8", "-m", "66"])
 
-        assert "Invalid value" in result.stdout
-        assert "66 is not in the range 0<=x<=59" in result.stdout
+        assert "Invalid value" in result.stderr
+        assert "66 is not in the range 0<=x<=59" in result.stderr
 
     def test_validates_hours(self):
         result = runner.invoke(app, ["set", "-c", "echo foo", "-h", "66", "-m", "1"])
-        assert "Invalid value" in result.stdout
-        assert "66 is not in the range 0<=x<=23" in result.stdout
+        assert "Invalid value" in result.stderr
+        assert "66 is not in the range 0<=x<=23" in result.stderr
 
     def test_logs_warning_when_create_schedule_raises(self, mocker):
         mock_logger = mocker.patch("cli.schedule.get_logger").return_value
@@ -259,7 +259,7 @@ def test_logs_only_value_of_requested_task_spec(self, mocker, task_from_id):
 
     def test_complains_when_no_id_provided(self):
         result = runner.invoke(app, ["get", "--command"])
-        assert "Missing argument 'id'" in result.stdout
+        assert "Missing argument 'id'" in result.stderr
 
 
 class TestList:
@@ -302,7 +302,7 @@ def test_warns_when_wrong_format_provided(self, mocker, task_list):
 
         assert mock_tabulate.call_count == 0
         assert wrong_format not in tabulate_formats
-        assert "Table format has to be one of" in result.stdout
+        assert "Table format has to be one of" in result.stderr
 
 
 class TestUpdate:
@@ -356,15 +356,15 @@ def test_ensures_proper_hourly_params(self, mocker):
 
     def test_validates_minute(self):
         result = runner.invoke(app, ["update", "42", "--minute", "88"])
-        assert "88 is not in the range 0<=x<=59" in result.stdout
+        assert "88 is not in the range 0<=x<=59" in result.stderr
 
     def test_validates_hour(self):
         result = runner.invoke(app, ["update", "42", "--daily", "--hour", "33"])
-        assert "33 is not in the range 0<=x<=23" in result.stdout
+        assert "33 is not in the range 0<=x<=23" in result.stderr
 
     def test_complains_when_no_id_provided(self):
         result = runner.invoke(app, ["update"])
-        assert "Missing argument 'id'" in result.stdout
+        assert "Missing argument 'id'" in result.stderr
 
     def test_exits_early_when_nothing_to_update(self, mocker):
         mock_logger = mocker.patch("cli.schedule.get_logger").return_value

tests/test_cli_students.py

@@ -27,8 +27,8 @@ def test_main_subcommand_without_args_prints_help():
         app,
         [],
     )
-    assert result.exit_code == 0
-    assert "Show this message and exit." in result.stdout
+    assert result.exit_code == 2
+    assert "Show this message and exit." in result.stderr
 
 
 @pytest.mark.students

tests/test_cli_webapp.py

@@ -44,8 +44,8 @@ def test_main_subcommand_without_args_prints_help():
         app,
         [],
     )
-    assert result.exit_code == 0
-    assert "Show this message and exit." in result.stdout
+    assert result.exit_code == 2
+    assert "Show this message and exit." in result.stderr
 
 
 def test_list_webapps(mocker):
@@ -240,8 +240,8 @@ def test_validates_log_number(mock_webapp):
     result = runner.invoke(
         app, ["delete-logs", "-d", "foo.bar.baz", "-t", "server", "-i", "10"]
     )
-    assert "Invalid value" in result.stdout
-    assert "log_index has to be 0 for current" in result.stdout
+    assert "Invalid value" in result.stderr
+    assert "log_index has to be 0 for current" in result.stderr
 
 
 def test_delete_webapp(mock_webapp, domain_name):

tests/test_cli_website.py

@@ -66,8 +66,8 @@ def test_main_subcommand_without_args_prints_help():
         app,
         [],
     )
-    assert result.exit_code == 0
-    assert "Show this message and exit." in result.stdout
+    assert result.exit_code == 2
+    assert "Show this message and exit." in result.stderr
 
 
 def test_create_without_domain_barfs():
@@ -80,7 +80,7 @@ def test_create_without_domain_barfs():
         ],
     )
     assert result.exit_code != 0
-    assert "Missing option" in result.stdout
+    assert "Missing option" in result.stderr
 
 
 def test_create_without_command_barfs():
@@ -93,7 +93,7 @@ def test_create_without_command_barfs():
         ],
     )
     assert result.exit_code != 0
-    assert "Missing option" in result.stdout
+    assert "Missing option" in result.stderr
 
 
 def test_create_with_domain_and_command_creates_it(mock_website):
@@ -350,7 +350,7 @@ def test_reload_with_no_domain_barfs():
         ],
     )
     assert result.exit_code != 0
-    assert "Missing option" in result.stdout
+    assert "Missing option" in result.stderr
 
 
 def test_reload_with_domain_reloads(mocker, mock_echo, mock_website):
@@ -379,7 +379,7 @@ def test_delete_with_no_domain_barfs():
         ],
     )
     assert result.exit_code != 0
-    assert "Missing option" in result.stdout
+    assert "Missing option" in result.stderr
 
 
 def test_delete_with_domain_deletes_it(mocker, mock_echo, mock_website):