retry recovery test

Author: meejah

src/_zkapauthorizer/tests/test_client_resource.py

@@ -979,17 +979,15 @@ async def do_download(set_state):
                     raise fails.pop(0)
                 downloads.append(set_state)
                 return (
-                    # this data is CBOR for {"version": 1, "statements": []}
-                    lambda: BytesIO(b"\xa2gversion\x01jstatements\x80"),
+                    lambda: BytesIO(statements_to_snapshot([])),
                     [],  # no event-streams
                 )
 
             return do_download
 
         clock = MemoryReactorClockResolver()
         store = self.useFixture(TemporaryVoucherStore(aware_now, get_config)).store
-        recoverer = StatefulRecoverer()
-        factory = RecoverFactory(store, get_sometimes_fail_downloader, recoverer)
+        factory = RecoverFactory(store, get_sometimes_fail_downloader)
         pumper = create_pumper()
         self.addCleanup(pumper.stop)
 
@@ -1001,76 +999,63 @@ def create_proto():
         agent = create_memory_agent(clock, pumper, create_proto)
         pumper.start()
 
-        async def recover():
-            proto = await agent.open(
-                "ws://127.0.0.1:1/storage-plugins/privatestorageio-zkapauthz-v2/recover",
-                {"headers": {"Authorization": f"tahoe-lafs {api_auth_token}"}},
-            )
-            updates = []
-            proto.on("message", lambda *args, **kw: updates.append((args, kw)))
-            await proto.is_open
-            proto.sendMessage(
-                json.dumps({"recovery-capability": self.GOOD_CAPABILITY}).encode("utf8")
-            )
-            await proto.is_closed
-            return updates
-
-        # first recovery will fails
-        d0 = Deferred.fromCoroutine(recover())
+        # first recovery will fail
+        d0 = Deferred.fromCoroutine(recover(
+            agent,
+            DecodedURL.from_text("ws://127.0.0.1:1/"),
+            api_auth_token,
+            self.GOOD_CAPABILITY,
+        ))
         pumper._flush()
 
-        # try again
-        d1 = Deferred.fromCoroutine(recover())
+        # try to recover again (this one should work, as we only fail
+        # once in the test-provided downloader)
+        d1 = Deferred.fromCoroutine(recover(
+            agent,
+            DecodedURL.from_text("ws://127.0.0.1:1/"),
+            api_auth_token,
+            self.GOOD_CAPABILITY,
+        ))
         pumper._flush()
 
         self.assertThat(
             d0,
             succeeded(
-                AfterPreprocessing(
-                    lambda messages: list(
-                        loads(args[0]) for (args, kwargs) in messages
-                    ),
-                    Equals(
-                        [
-                            {
-                                "stage": "started",
-                                "failure-reason": None,
-                            },
-                            # "our" downloader (above) doesn't set any downloading etc
-                            # state-updates
-                            {
-                                "stage": "download_failed",
-                                "failure-reason": "downloader fails",
-                            },
-                        ]
-                    ),
+                Equals(
+                    [
+                        {
+                            "stage": "started",
+                            "failure-reason": None,
+                        },
+                        # "our" downloader (above) doesn't set any downloading etc
+                        # state-updates
+                        {
+                            "stage": "download_failed",
+                            "failure-reason": "downloader fails",
+                        },
+                    ]
                 )
-            ),
+            )
         )
-        # second attempt should have succeeded
+        # second attempt should succeed
         self.assertThat(
             d1,
             succeeded(
-                AfterPreprocessing(
-                    lambda messages: list(
-                        loads(args[0]) for (args, kwargs) in messages
-                    ),
-                    Equals(
-                        [
-                            {
-                                "stage": "started",
-                                "failure-reason": None,
-                            },
-                            # "our" downloader (above) doesn't set any downloading etc
-                            # state-updates
-                            {
-                                "stage": "succeeded",
-                                "failure-reason": None,
-                            },
-                        ]
-                    ),
+                Equals(
+                    [
+                        {
+                            "stage": "started",
+                            "failure-reason": None,
+                        },
+                        # "our" downloader (above) doesn't set any downloading etc
+                        # state-updates
+                        {
+                            "stage": "succeeded",
+                            "failure-reason": None,
+                        },
+                    ]
                 )
-            ),
+            )
         )