Skip to content

Commit

Permalink
Avoid cowsay \s warnings under Python 3.13.0a4.
Browse files Browse the repository at this point in the history
  • Loading branch information
jsirois committed Feb 24, 2024
1 parent c1e26df commit e08e783
Showing 1 changed file with 6 additions and 16 deletions.
22 changes: 6 additions & 16 deletions tests/integration/cli/commands/test_lock_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -1002,9 +1002,7 @@ def test_sync_venv_run_no_retain_pip_preinstalled(
"Moo Two!",
]
)
).assert_success(
expected_output_re=r".*| Moo Two! |.*", expected_error_re=NO_OUTPUT, re_flags=re.DOTALL
)
).assert_success(expected_output_re=r".*| Moo Two! |.*", re_flags=re.DOTALL)
assert_lock_matches_venv(
lock=lock, venv=venv, path_mappings=path_mappings, expected_pins=[pin("cowsay", "5.0")]
)
Expand Down Expand Up @@ -1044,9 +1042,7 @@ def test_sync_venv_run_retain_pip_preinstalled(
"A New Moo!",
]
)
).assert_success(
expected_output_re=r".*| A New Moo! |.*", expected_error_re=NO_OUTPUT, re_flags=re.DOTALL
)
).assert_success(expected_output_re=r".*| A New Moo! |.*", re_flags=re.DOTALL)

assert_lock(lock, path_mappings, expected_pins=[pin("cowsay", "6.0")])
assert_venv(venv_dir, expected_pins=[pin("cowsay", "6.0"), pip_pin])
Expand Down Expand Up @@ -1083,9 +1079,7 @@ def test_sync_venv_run_retain_pip_no_pip_preinstalled(
"Moo!",
]
)
).assert_success(
expected_output_re=r".*| Moo! |.*", expected_error_re=NO_OUTPUT, re_flags=re.DOTALL
)
).assert_success(expected_output_re=r".*| Moo! |.*", re_flags=re.DOTALL)
lock_file = assert_lock_matches_venv(
lock=lock, path_mappings=path_mappings, venv=venv_dir, expected_pins=[pin("cowsay", "5.0")]
)
Expand All @@ -1106,10 +1100,8 @@ def test_sync_venv_run_retain_pip_no_pip_preinstalled(
)
).assert_success(
expected_output_re=r".*| Moo Two! |.*",
expected_error_re=re_exact(
"No updates for lock generated by {platform}.".format(
platform=lock_file.locked_resolves[0].platform_tag
)
expected_error_re=r".*No updates for lock generated by {platform}\..*".format(
platform=re.escape(str(lock_file.locked_resolves[0].platform_tag))
),
re_flags=re.DOTALL,
)
Expand Down Expand Up @@ -1176,9 +1168,7 @@ def test_sync_venv_run_retain_user_pip(
"A New Moo!",
]
)
).assert_success(
expected_output_re=r".*| A New Moo! |.*", expected_error_re=NO_OUTPUT, re_flags=re.DOTALL
)
).assert_success(expected_output_re=r".*| A New Moo! |.*", re_flags=re.DOTALL)

user_pip = find_distribution("pip", search_path=venv.sys_path, rescan=True)
assert user_pip is not None
Expand Down

0 comments on commit e08e783

Please sign in to comment.