Work around failing test cases on Travis CI

clue · Nov 6, 2019 · 1ea8bd3 · 1ea8bd3
1 parent 13e9ff9
commit 1ea8bd3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/tests/Phar/PackagerTest.php b/tests/Phar/PackagerTest.php
@@ -21,15 +21,29 @@ public function testExec($expectedOutput, $command)
     {
         $this->expectOutputString($expectedOutput);
 
+        // Travis CI occasionally discards (parts of) the output, so add some delay just in case
+        if (getenv('TRAVIS') === 'true') {
+            $command .= '; sleep 0.1';
+        }
+
         $this->packager->exec($command);
     }
 
     public function provideExecCommands()
     {
         return array(
-            array("\n    output\n", 'echo output'),
-            array("\n    error\n", 'echo error >&2'),
-            array("\n    mixed\n    errors\n", 'echo mixed && echo errors >&1'),
+            array(
+                "\n    output\n",
+                'echo output'
+            ),
+            array(
+                "\n    error\n",
+                'echo error >&2'
+            ),
+            array(
+                "\n    mixed\n    errors\n",
+                'echo mixed && echo errors >&1'
+            )
         );
     }
 

diff --git a/tests/Phar/TargetPharTest.php b/tests/Phar/TargetPharTest.php
@@ -23,6 +23,10 @@ class TargetPharTest extends TestCase
      */
     public function setUp()
     {
+        if (PHP_VERSION_ID >= 50400 && PHP_VERSION_ID <= 50600) {
+            $this->markTestSkipped('Unable to mock \Phar on PHP 5.4/5.5');
+        }
+
         $this->mockPhar = $this->createMock('\Phar');
         $this->mockBox  = $this->createMock('Herrera\Box\Box');
         $this->mockBox->expects($this->any())