com phpruntests: fixing for Georg: tests/testcase/rtGetExecutionTest.php
| From: | David Soria Parra | Date: | Wed, 15 Jul 2009 15:24:01 +0000 |
| Subject: | com phpruntests: fixing for Georg: tests/testcase/rtGetExecutionTest.php | ||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-66340@lists.php.net to get a copy of this message | ||
Commit: 7b54440a22eb766f6cf6dc9e5b1c4e72c87e0ad0
Author: Zoe Slattery <zoe@php.net> Wed, 15 Jul 2009 15:24:01 +0000
Parents: 03fd94abf6a7fee090e8319a3211cd3d2aa068e6
Branches: master
Link: http://git.php.net/?p=phpruntests.git;a=commitdiff;h=7b54440a22eb766f6cf6dc9e5b1c4e72c87e0ad0
Log:
fixing for Georg
Changed paths:
M tests/testcase/rtGetExecutionTest.php
Diff:
diff --git a/tests/testcase/rtGetExecutionTest.php b/tests/testcase/rtGetExecutionTest.php
index 4a6a911..ca61966 100644
--- a/tests/testcase/rtGetExecutionTest.php
+++ b/tests/testcase/rtGetExecutionTest.php
@@ -49,7 +49,7 @@ class rtGetExecutionTest extends PHPUnit_Framework_TestCase
$status = $testCase->getStatus();
$this->assertEquals('85', strlen($output));
- $this->assertFalse($testCase->getStatus()->getValue('fail'));
+ $this->assertFalse($testCase->getStatus()->getValue('fail'));
}
@@ -78,13 +78,20 @@ class rtGetExecutionTest extends PHPUnit_Framework_TestCase
$testCase->executeTest($config);
$output = $testCase->getOutput();
//var_dump($output);
-
+
$status = $testCase->getStatus();
-
- $this->assertEquals(0, strlen($output));
- $this->assertTrue($testCase->getStatus()->getValue('skip'));
- $this->assertEquals('The CGI executable is unavailable',
$testCase->getStatus()->getMessage('skip'));
+
+ $setPhp = $configuration->getSetting('TEST_PHP_EXECUTABLE');
+
+ if (preg_match("/sapi/", $setPhp)) {
+ // Make no assertion bacuse the CGI executable can be guesed
+ } else {
+ $this->assertEquals(0, strlen($output));
+ $this->assertTrue($testCase->getStatus()->getValue('skip'));
+ $this->assertEquals('The CGI executable is unavailable',
$testCase->getStatus()->getMessage('skip'));
+ }
+
}