Fixes matomo-org#6651 Adding better health checks to the tests when d…

…ownloading/creating files
d19dotca · Dec 2, 2014 · 1393a9c · 1393a9c
1 parent c091edf
commit 1393a9c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/tests/PHPUnit/Fixtures/SqlDump.php b/tests/PHPUnit/Fixtures/SqlDump.php
@@ -36,20 +36,12 @@ public function setUp()
             $dumpPath = $this->dumpUrl;
         } else {
             $dumpPath = PIWIK_INCLUDE_PATH . '/tmp/logdump.sql.gz';
-            $bufferSize = 1024 * 1024;
+            $bytesRead = $this->downloadDumpInPath($dumpPath);
 
-            $dump = fopen($this->dumpUrl, 'rb');
-            $outfile = fopen($dumpPath, 'wb');
-            $bytesRead = 0;
-            while (!feof($dump)) {
-                fwrite($outfile, fread($dump, $bufferSize), $bufferSize);
-                $bytesRead += $bufferSize;
-            }
-            fclose($dump);
-            fclose($outfile);
-
-            if ($bytesRead <= 40 * 1024 * 1024) { // sanity check
-                throw new Exception("Could not download sql dump!");
+            // sanity check
+            if ($bytesRead <= 40 * 1024 * 1024) {
+                $str = "Could not download sql dump! You can manually download %s into %s";
+                throw new Exception(sprintf($str, $this->dumpUrl, $dumpPath));
             }
         }
 
@@ -93,4 +85,24 @@ public function tearDown()
     {
         // empty
     }
+
+    /**
+     * @param $dumpPath
+     * @return int
+     */
+    protected function downloadDumpInPath($dumpPath)
+    {
+        $bufferSize = 1024 * 1024;
+
+        $dump = fopen($this->dumpUrl, 'rb');
+        $outfile = fopen($dumpPath, 'wb');
+        $bytesRead = 0;
+        while (!feof($dump)) {
+            fwrite($outfile, fread($dump, $bufferSize), $bufferSize);
+            $bytesRead += $bufferSize;
+        }
+        fclose($dump);
+        fclose($outfile);
+        return $bytesRead;
+    }
 }
diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
@@ -727,6 +727,10 @@ public static function downloadAndUnzip($url, $outputDir, $filename)
 
         $dump = fopen($url, 'rb');
         $outfile = fopen($outfileName, 'wb');
+        if(!$outfile) {
+            throw new Exception("Failed to create file $outfileName - please check permissions");
+        }
+
         while (!feof($dump)) {
             fwrite($outfile, fread($dump, $bufferSize), $bufferSize);
         }