Skip to content

Commit 4f1caae

Browse files
committed
Update tests
1 parent 2536cfd commit 4f1caae

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

test/test_cli/test_script.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,18 @@ def test_help():
5252

5353

5454
test_commands = [
55-
pytest.param(f"""{executable} -l Photo items "{test_data_path / 'photos.json'}" """, id="list1"),
56-
pytest.param(f"""{executable} -l User - "{test_data_path / 'users.json'}" """, id="list2"),
55+
pytest.param(f"""{executable} -m Photo items "{test_data_path / 'photos.json'}" """, id="list1"),
56+
pytest.param(f"""{executable} -l Photo items "{test_data_path / 'photos.json'}" """, id="list1_legacy"),
57+
pytest.param(f"""{executable} -m User "{test_data_path / 'users.json'}" """, id="list2"),
58+
pytest.param(f"""{executable} -l User - "{test_data_path / 'users.json'}" """, id="list2_legacy"),
5759
pytest.param(f"""{executable} -m Photos "{test_data_path / 'photos.json'}" """, id="model1"),
5860

59-
pytest.param(f"""{executable} -l Photo items "{test_data_path / 'photos.json'}" \
61+
pytest.param(f"""{executable} -m Photo items "{test_data_path / 'photos.json'}" \
6062
-m Photos "{test_data_path / 'photos.json'}" """,
6163
id="list1_model1"),
6264

63-
pytest.param(f"""{executable} -l Photo items "{test_data_path / 'photos.json'}" \
64-
-l User - "{test_data_path / 'users.json'}" """,
65+
pytest.param(f"""{executable} -m Photo items "{test_data_path / 'photos.json'}" \
66+
-m User "{test_data_path / 'users.json'}" """,
6567
id="list1_list2"),
6668

6769
pytest.param(f"""{executable} -m Gist "{tmp_path / '*.gist'}" --dkf files""",
@@ -75,7 +77,7 @@ def test_help():
7577
pytest.param(f"""{executable} -m Gist "{tmp_path / '*.gist'}" --dkf files --datetime --strings-converters""",
7678
id="gists_strings_converters"),
7779

78-
pytest.param(f"""{executable} -l User - "{test_data_path / 'users.json'}" --strings-converters""",
80+
pytest.param(f"""{executable} -m User "{test_data_path / 'users.json'}" --strings-converters""",
7981
id="users_strings_converters"),
8082
pytest.param(f"""{executable} -m SomeUnicode "{test_data_path / 'unicode.json'}" """,
8183
id="convert_unicode"),
@@ -216,15 +218,15 @@ def trim_header(line_string):
216218

217219

218220
wrong_arguments_commands = [
219-
pytest.param(f"""{executable} -l Model items "{test_data_path / 'photos.json'}" \
220-
-l Model - "{test_data_path / 'users.json'}" """, id="duplicate_name"),
221-
pytest.param(f"""{executable} -l Model items "{test_data_path / 'photos.json'}" --merge unknown""",
221+
pytest.param(f"""{executable} -m Model items "{test_data_path / 'photos.json'}" \
222+
-m Model - "{test_data_path / 'users.json'}" """, id="duplicate_name"),
223+
pytest.param(f"""{executable} -m Model items "{test_data_path / 'photos.json'}" --merge unknown""",
222224
id="wrong_merge_policy"),
223-
pytest.param(f"""{executable} -l Model items "{test_data_path / 'photos.json'}" --merge unknown_10""",
225+
pytest.param(f"""{executable} -m Model items "{test_data_path / 'photos.json'}" --merge unknown_10""",
224226
id="wrong_merge_policy"),
225-
pytest.param(f"""{executable} -l Model items "{test_data_path / 'photos.json'}" -f custom""",
227+
pytest.param(f"""{executable} -m Model items "{test_data_path / 'photos.json'}" -f custom""",
226228
id="custom_model_generator_without_class_link"),
227-
pytest.param(f"""{executable} -l Model items "{test_data_path / 'photos.json'}" --code-generator test""",
229+
pytest.param(f"""{executable} -m Model items "{test_data_path / 'photos.json'}" --code-generator test""",
228230
id="class_link_without_custom_model_generator_enabled"),
229231
]
230232

0 commit comments

Comments
 (0)