test: handle warnings generated by our own tests

test/test_main.py

@@ -189,12 +189,6 @@ def test_storage_no_storage(self):
 
     def test_storage_with_storage(self):
         # here we patch juju_backend_available, so it gets set up and falls over when used
-        with patch('ops.storage.juju_backend_available') as juju_backend_available:
-            juju_backend_available.return_value = True
-            with pytest.raises(FileNotFoundError, match='state-get'):
-                self._check(ops.CharmBase, use_juju_for_storage=True)
-
-    def test_controller_storage_deprecated(self):
         with patch('ops.storage.juju_backend_available') as juju_backend_available:
             juju_backend_available.return_value = True
             with pytest.warns(DeprecationWarning, match='Controller storage'):

test/test_model.py

@@ -3643,11 +3643,13 @@ def test_from_dict(self):
         assert info.rotates is None
         assert info.description is None
 
-        info = ops.SecretInfo.from_dict('5', {'revision': 9})
+        with pytest.warns(DeprecationWarning, match='`model_uuid` should always be provided'):
+            info = ops.SecretInfo.from_dict('5', {'revision': 9})
         assert info.id == 'secret:5'
         assert info.revision == 9
 
-        info = ops.SecretInfo.from_dict('secret://abcd/6', {'revision': 9})
+        with pytest.warns(DeprecationWarning, match='`model_uuid` should always be provided'):
+            info = ops.SecretInfo.from_dict('secret://abcd/6', {'revision': 9})
         assert info.id == 'secret://abcd/6'
         assert info.revision == 9
 

testing/src/scenario/mocking.py

@@ -481,6 +481,7 @@ def secret_info_get(
             expires=secret.expire,
             rotation=secret.rotate,
             rotates=None,  # not implemented yet.
+            model_uuid=self._state.model.uuid,
         )
 
     def secret_set(

testing/tests/test_context_on.py

@@ -55,8 +55,6 @@ def _on_event(self, event):
         ("update_status", ops.UpdateStatusEvent),
         ("config_changed", ops.ConfigChangedEvent),
         ("upgrade_charm", ops.UpgradeCharmEvent),
-        ("pre_series_upgrade", ops.PreSeriesUpgradeEvent),
-        ("post_series_upgrade", ops.PostSeriesUpgradeEvent),
         ("leader_elected", ops.LeaderElectedEvent),
     ],
 )
@@ -71,6 +69,25 @@ def test_simple_events(event_name, event_kind):
         assert isinstance(mgr.charm.observed[0], event_kind)
 
 
+@pytest.mark.parametrize(
+    "event_name, event_kind",
+    [
+        ("pre_series_upgrade", ops.PreSeriesUpgradeEvent),
+        ("post_series_upgrade", ops.PostSeriesUpgradeEvent),
+    ],
+)
+def test_simple_deprecated_events(event_name, event_kind):
+    ctx = scenario.Context(ContextCharm, meta=META, actions=ACTIONS)
+    # These look like:
+    #   ctx.run(ctx.on.pre_series_upgrade(), state)
+    with pytest.warns(DeprecationWarning):
+        with ctx(getattr(ctx.on, event_name)(), scenario.State()) as mgr:
+            mgr.run()
+            assert len(mgr.charm.observed) == 2
+            assert isinstance(mgr.charm.observed[1], ops.CollectStatusEvent)
+            assert isinstance(mgr.charm.observed[0], event_kind)
+
+
 @pytest.mark.parametrize("as_kwarg", [True, False])
 @pytest.mark.parametrize(
     "event_name,event_kind,owner",

tox.ini

@@ -103,7 +103,8 @@ deps =
     -e .
     -e testing
 commands =
-    pytest -n auto --ignore={[vars]tst_path}smoke -v --tb native {posargs}
+    pytest -n auto --ignore={[vars]tst_path}smoke -v --tb native \
+        -W 'ignore:Harness is deprecated:PendingDeprecationWarning' {posargs}
 
 [testenv:coverage]
 description = Run unit tests with coverage