Changeset 150

Timestamp:

04/26/08 00:29:38 (9 months ago)

Author:

iteman

Message:

- Fixed a defect that caused tests to be run every time if fileperms()/filemtime() fails when using autotest.

Location:

trunk/src/Stagehand/TestRunner

Files:

• AlterationMonitor.php (modified) (2 diffs)
• DirectoryScanner (added)
• DirectoryScanner.php (modified) (2 diffs)
• DirectoryScanner/Exception.php (added)

trunk/src/Stagehand/TestRunner/AlterationMonitor.php

@@ -38 +38 @@
 require_once 'Stagehand/TestRunner/Exception.php';
 require_once 'Stagehand/TestRunner/DirectoryScanner.php';
+require_once 'Stagehand/TestRunner/DirectoryScanner/Exception.php';
 
 // {{{ Stagehand_TestRunner_AlterationMonitor
@@ -140 +141 @@
      * @param string $element
      * @throws Stagehand_TestRunner_Exception
+     * @throws Stagehand_TestRunner_DirectoryScanner_Exception
      */
     public function detectChanges($element)
     {
         if (!$this->_isFirstTime) {
+            $perms = fileperms($element);
+            if ($perms === false) {
+                throw new Stagehand_TestRunner_DirectoryScanner_Exception();
+            }
+
             if (!array_key_exists($element, $this->_previousElements)) {
                 throw new Stagehand_TestRunner_Exception();
             }
 
+            if ($this->_previousElements[$element]['perms'] != $perms) {
+                throw new Stagehand_TestRunner_Exception();
+            }
+
             if (!is_dir($element)) {
                 $mtime = filemtime($element);
+                if ($mtime === false) {
+                    throw new Stagehand_TestRunner_DirectoryScanner_Exception();
+                }
+
                 if ($this->_previousElements[$element]['mtime'] != $mtime) {
                     throw new Stagehand_TestRunner_Exception();
                 }
             }
-
-            $perms = fileperms($element);
-            if ($this->_previousElements[$element]['perms'] != $perms) {
-                throw new Stagehand_TestRunner_Exception();
-            }
-        }
-
+        }
+
+        $perms = fileperms($element);
+        if ($perms === false) {
+            throw new Stagehand_TestRunner_DirectoryScanner_Exception();
+        }
+
+        $this->_currentElements[$element]['perms'] = $perms;
         if (!is_dir($element)) {
-            $this->_currentElements[$element]['mtime'] = filemtime($element);
-        }
-
-        $this->_currentElements[$element]['perms'] = fileperms($element);
+            $mtime = filemtime($element);
+            if ($mtime === false) {
+                throw new Stagehand_TestRunner_DirectoryScanner_Exception();
+            }
+
+            $this->_currentElements[$element]['mtime'] = $mtime;
+        }
     }
 

trunk/src/Stagehand/TestRunner/DirectoryScanner.php

@@ -35 +35 @@
  * @since      File available since Release 2.1.0
  */
+
+require_once 'Stagehand/TestRunner/DirectoryScanner/Exception.php';
 
 // {{{ Stagehand_TestRunner_DirectoryScanner
@@ -123 +125 @@
 
             $element = $directory . DIRECTORY_SEPARATOR . $files[$i];
-            call_user_func($this->_callback, $element);
+            try {
+                call_user_func($this->_callback, $element);
+            } catch (Stagehand_TestRunner_DirectoryScanner_Exception $e) {
+                continue;
+            }
 
             if (is_dir($element) && $this->_isRecursive) {