Merge branch 'QA_5_1' into QA_5_2

phpmyadmin · Mar 25, 2022 · 0b84aac · 0b84aac
2 parents 16aa04f + cbd23e5
commit 0b84aac
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/test/classes/GitTest.php b/test/classes/GitTest.php
@@ -200,6 +200,13 @@ public function testCheckGitRevisionPacksFolder(): void
 
         $commit = $this->object->checkGitRevision();
 
+        if (
+            $commit === null
+            && ! isset($_SESSION['PMA_VERSION_REMOTECOMMIT_17bf8b7309919f8ac593d7c563b31472780ee83b'])
+        ) {
+            $this->markTestSkipped('Unable to get remote commit information.');
+        }
+
         $this->assertIsArray($commit);
         $this->assertArrayHasKey('hash', $commit);
         $this->assertEquals('17bf8b7309919f8ac593d7c563b31472780ee83b', $commit['hash']);
@@ -317,6 +324,13 @@ public function testCheckGitRevisionPacksFile(): void
 
         $commit = $this->object->checkGitRevision();
 
+        if (
+            $commit === null
+            && ! isset($_SESSION['PMA_VERSION_REMOTECOMMIT_17bf8b7309919f8ac593d7c563b31472780ee83b'])
+        ) {
+            $this->markTestSkipped('Unable to get remote commit information.');
+        }
+
         $this->assertIsArray($commit);
         $this->assertArrayHasKey('hash', $commit);
         $this->assertEquals('17bf8b7309919f8ac593d7c563b31472780ee83b', $commit['hash']);