Don't let network issues get you down

Author: soatok

tests/ActivityPub/WebFingerTest.php

@@ -22,12 +22,12 @@
     Exception\ClientException,
     Exception\GuzzleException,
     Exception\RequestException,
+    Exception\ServerException,
     Handler\MockHandler,
     HandlerStack,
     Middleware,
     Psr7\Request,
-    Psr7\Response
-};
+    Psr7\Response};
 use ParagonIE\Certainty\{
     Exception\CertaintyException,
     RemoteFetch
@@ -53,7 +53,11 @@ class WebFingerTest extends TestCase
 
     public function tearDown(): void
     {
-        new WebFinger($this->getConfig())->clearCaches();
+        try {
+            new WebFinger($this->getConfig())->clearCaches();
+        } catch (ServerException $ex) {
+            $this->markTestSkipped($ex->getMessage());
+        }
     }
 
     public function testConstructorDefaults(): void

tests/Integration/ActorLifecycleTest.php

@@ -69,6 +69,7 @@
     CoversClass,
     UsesClass
 };
+use GuzzleHttp\Exception\ServerException;
 use JsonException as BaseJsonException;
 use GuzzleHttp\Exception\GuzzleException;
 use ParagonIE\ConstantTime\Base64UrlSafe;
@@ -187,7 +188,11 @@ public function testOtherActionsWithPeerRewrapping(): void
         $this->clearOldTransaction($config);
         $protocol = new Protocol($config);
 
-        $wf = new WebFinger($config);
+        try {
+            $wf = new WebFinger($config);
+        } catch (ServerException $ex) {
+            $this->markTestSkipped($ex->getMessage());
+        }
         $wf->setCanonicalForTesting($canonical, $canonical);
         $wf->setCanonicalForTesting($canonical2, $canonical2);
 

tests/ProtocolTest.php

@@ -27,6 +27,7 @@
     Handler
 };
 use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Exception\ServerException;
 use ParagonIE\Certainty\Exception\CertaintyException;
 use ParagonIE\HPKE\KEM\PQKEM\EncapsKey;
 use ParagonIE\PQCrypto\Exception\MLDSAInternalException;
@@ -370,7 +371,12 @@ public function testMoveIdentity(): void
         $this->addTestPeer();
         [$oldActor, $canonical] = $this->makeDummyActor();
         [$newActor, $canonical2] = $this->makeDummyActor();
-        $wf = new WebFinger($this->config);
+        try {
+            $wf = new WebFinger($this->config);
+        } catch (ServerException $ex) {
+            // Network issue, not a code issue:
+            $this->markTestSkipped($ex->getMessage());
+        }
         $wf->setCanonicalForTesting($oldActor, $canonical);
         $wf->setCanonicalForTesting($newActor, $canonical2);
         $wf->setCanonicalForTesting($canonical, $canonical);

tests/RequestHandlers/Api/ReplicaInfoTest.php

@@ -23,6 +23,7 @@
     Handler,
     ProtocolMessageInterface
 };
+use GuzzleHttp\Exception\ServerException;
 use FediE2EE\PKD\Crypto\{Merkle\InclusionProof, SecretKey, SymmetricKey};
 use GuzzleHttp\Psr7\Response;
 use FediE2EE\PKDServer\Protocol\{
@@ -168,7 +169,11 @@ public function beforeTests(): void
         [$canonical, $sk] = $this->makeAndStoreDummyActor();
 
         // Next, let's kick off replication:
-        $witness = new Witness($this->config);
+        try {
+            $witness = new Witness($this->config);
+        } catch (ServerException $ex) {
+            $this->markTestSkipped($ex->getMessage());
+        }
         $witness->run();
 
         // Now let's store the dummy info: