Skip to content

Commit c835e9b

Browse files
committed
Comply the code with Python 3.5.
1 parent 92b39fd commit c835e9b

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

checkbox-ng/checkbox_ng/launcher/test_subcommands.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ def test__save_manifest_no_or_empty_manifest_repr(self):
11191119
with self.subTest(case=case_name):
11201120
self.ctx_mock.sa.get_manifest_repr.return_value = manifest_repr
11211121
self.launcher._save_manifest(interactive=True)
1122-
self.ctx_mock.sa.save_manifest.assert_not_called()
1122+
self.assertEqual(self.ctx_mock.sa.save_manifest.call_count, 0)
11231123

11241124
@patch("checkbox_ng.launcher.subcommands.ManifestBrowser")
11251125
def test__save_manifest_interactive_with_visible_manifests(
@@ -1143,8 +1143,9 @@ def test__save_manifest_interactive_with_visible_manifests(
11431143

11441144
self.launcher._save_manifest(interactive=True)
11451145

1146-
mock_browser.run.assert_called_once()
1147-
self.ctx_mock.sa.save_manifest.assert_called_once_with(
1146+
self.assertEqual(mock_browser.run.call_count, 1)
1147+
self.assertEqual(self.ctx_mock.sa.save_manifest.call_count, 1)
1148+
self.ctx_mock.sa.save_manifest.assert_called_with(
11481149
{"visible1": "user_value1", "visible2": "user_value2"}
11491150
)
11501151

@@ -1167,10 +1168,11 @@ def test__save_manifest_interactive_no_visible_manifests(
11671168

11681169
self.launcher._save_manifest(interactive=True)
11691170

1170-
mock_browser_class.assert_not_called()
1171-
mock_browser_class.has_visible_manifests.assert_called_once()
1172-
mock_browser_class.get_default_values.assert_called_once()
1173-
self.ctx_mock.sa.save_manifest.assert_called_once_with(
1171+
self.assertEqual(mock_browser_class.call_count, 0)
1172+
self.assertEqual(mock_browser_class.has_visible_manifests.call_count, 1)
1173+
self.assertEqual(mock_browser_class.get_default_values.call_count, 1)
1174+
self.assertEqual(self.ctx_mock.sa.save_manifest.call_count, 1)
1175+
self.ctx_mock.sa.save_manifest.assert_called_with(
11741176
{"hidden1": "default1", "hidden2": "default2"}
11751177
)
11761178

@@ -1191,11 +1193,13 @@ def test__save_manifest_non_interactive(self, mock_browser_class):
11911193

11921194
self.launcher._save_manifest(interactive=False)
11931195

1194-
mock_browser_class.assert_not_called()
1195-
mock_browser_class.has_visible_manifests.assert_not_called()
1196-
mock_browser_class.get_default_values.assert_called_once_with(
1196+
self.assertEqual(mock_browser_class.call_count, 0)
1197+
self.assertEqual(mock_browser_class.has_visible_manifests.call_count, 0)
1198+
self.assertEqual(mock_browser_class.get_default_values.call_count, 1)
1199+
mock_browser_class.get_default_values.assert_called_with(
11971200
manifest_repr
11981201
)
1199-
self.ctx_mock.sa.save_manifest.assert_called_once_with(
1202+
self.assertEqual(self.ctx_mock.sa.save_manifest.call_count, 1)
1203+
self.ctx_mock.sa.save_manifest.assert_called_with(
12001204
{"manifest1": "default1", "manifest2": "default2"}
12011205
)

0 commit comments

Comments
 (0)