Merge branch 'posix_getuid' into develop

zendframework · Oct 1, 2012 · 167fdbf · 167fdbf
commit 167fdbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/test/Storage/MboxFolderTest.php b/test/Storage/MboxFolderTest.php
@@ -310,6 +310,8 @@ public function testNotReadableFolder()
         if (!$check) {
             if (function_exists('posix_getuid') && posix_getuid() === 0) {
                 $this->markTestSkipped('seems like you are root and we therefore cannot test the error handling');
+            } elseif (!function_exists('posix_getuid')) {
+                $this->markTestSkipped('Can\t test if you\'re root and we therefore cannot test the error handling');
             }
             $this->fail('no exception while loading invalid dir with subfolder not readable');
         }

diff --git a/test/Storage/MboxTest.php b/test/Storage/MboxTest.php
@@ -263,6 +263,8 @@ public function testSleepWakeRemoved()
         if (!$check) {
             if (function_exists('posix_getuid') && posix_getuid() === 0) {
                 $this->markTestSkipped('seems like you are root and we therefore cannot test the error handling');
+            } elseif (!function_exists('posix_getuid')) {
+                $this->markTestSkipped('Can\t test if you\'re root and we therefore cannot test the error handling');
             }
             $this->fail('no exception while waking with non readable file');
          }