Merge pull request #169 from redpwn/test/match-warnings

fix(test): use match kwarg to check warning messages

Author: ethanwu10

tests/challenge/test_config.py

@@ -110,15 +110,11 @@ def test_nonexistent_flag_file(configloader, test_datadir) -> None:
 
 
 def test_warn_multiline_flag(configloader, test_datadir) -> None:
-    with pytest.warns(RuntimeWarning) as record:
+    with pytest.warns(
+        RuntimeWarning, match=r"^Flag contains multiple lines; is this intended\?$"
+    ):
         cfg, errors = configloader.check_config(test_datadir / "challenge.yml")
     assert errors is None
-    assert len(record) == 1
-    assert isinstance(record[0].message, Warning)
-    assert (
-        str(record[0].message.args[0])
-        == "Flag contains multiple lines; is this intended?"
-    )
 
 
 def test_default_category(configloader, test_datadir) -> None:

tests/project/test_assets.py

@@ -303,23 +303,17 @@ def test_extra_file(self, datadir: Path, am_fn: assets.AssetManager) -> None:
         file1 = ctx._root / "files" / "file1"
         with file1.open("w") as fd:
             fd.write("abcd")
-        with pytest.warns(RuntimeWarning) as record:
+        with pytest.warns(RuntimeWarning, match=r"^Unexpected item found in cache: "):
             ctx.sync(check=True)
-        assert len(record) == 1
-        assert isinstance(record[0].message, Warning)
-        assert "Unexpected item found in cache: " in str(record[0].message.args[0])
         assert not file1.exists()
 
     def test_extra_dir(self, datadir: Path, am_fn: assets.AssetManager) -> None:
         asset_manager = am_fn
         ctx = asset_manager.create_context("challenge")
         dir1 = ctx._root / "files" / "dir1"
         dir1.mkdir()
-        with pytest.warns(RuntimeWarning) as record:
+        with pytest.warns(RuntimeWarning, match=r"^Unexpected item found in cache: "):
             ctx.sync(check=True)
-        assert len(record) == 1
-        assert isinstance(record[0].message, Warning)
-        assert "Unexpected item found in cache: " in str(record[0].message.args[0])
         assert not dir1.exists()
 
     def test_broken_link(self, datadir: Path, am_fn: assets.AssetManager) -> None: