| Index: trunk/phase3/maintenance/tests/ApiTest.php |
| — | — | @@ -55,10 +55,8 @@ |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | function testApi() { |
| 59 | | - global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype; |
| | 59 | + global $wgServerName, $wgServer; |
| 60 | 60 | |
| 61 | | - if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) ) |
| 62 | | - $this->markTestSkipped( "This test can't (yet?) be run with the parser tests" ); |
| 63 | 61 | if ( !isset( $wgServerName ) || !isset( $wgServer ) ) { |
| 64 | 62 | $this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' . |
| 65 | 63 | 'be set in LocalSettings.php' ); |
| — | — | @@ -73,10 +71,8 @@ |
| 74 | 72 | } |
| 75 | 73 | |
| 76 | 74 | function testApiLoginNoName() { |
| 77 | | - global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype; |
| | 75 | + global $wgServerName, $wgServer; |
| 78 | 76 | |
| 79 | | - if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) ) |
| 80 | | - $this->markTestSkipped( "This test can't (yet?) be run with the parser tests" ); |
| 81 | 77 | if ( !isset( $wgServerName ) || !isset( $wgServer ) ) { |
| 82 | 78 | $this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' . |
| 83 | 79 | 'be set in LocalSettings.php' ); |
| — | — | @@ -94,10 +90,8 @@ |
| 95 | 91 | } |
| 96 | 92 | |
| 97 | 93 | function testApiLoginBadPass() { |
| 98 | | - global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype; |
| | 94 | + global $wgServerName, $wgServer; |
| 99 | 95 | |
| 100 | | - if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) ) |
| 101 | | - $this->markTestSkipped( "This test can't (yet?) be run with the parser tests" ); |
| 102 | 96 | if ( !isset( $wgServerName ) || !isset( $wgServer ) ) { |
| 103 | 97 | $this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' . |
| 104 | 98 | 'be set in LocalSettings.php' ); |
| — | — | @@ -131,10 +125,8 @@ |
| 132 | 126 | } |
| 133 | 127 | |
| 134 | 128 | function testApiLoginGoodPass() { |
| 135 | | - global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype; |
| | 129 | + global $wgServerName, $wgServer; |
| 136 | 130 | |
| 137 | | - if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) ) |
| 138 | | - $this->markTestSkipped( "This test can't (yet?) be run with the parser tests" ); |
| 139 | 131 | if ( !isset( $wgServerName ) || !isset( $wgServer ) ) { |
| 140 | 132 | $this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' . |
| 141 | 133 | 'be set in LocalSettings.php' ); |
| — | — | @@ -171,10 +163,8 @@ |
| 172 | 164 | } |
| 173 | 165 | |
| 174 | 166 | function testApiGotCookie() { |
| 175 | | - global $wgServerName, $wgServer, $wgScriptPath, $wgDBprefix, $wgDBtype; |
| | 167 | + global $wgServerName, $wgServer, $wgScriptPath; |
| 176 | 168 | |
| 177 | | - if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) ) |
| 178 | | - $this->markTestSkipped( "This test can't (yet?) be run with the parser tests" ); |
| 179 | 169 | if ( !isset( $wgServerName ) || !isset( $wgServer ) ) { |
| 180 | 170 | $this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' . |
| 181 | 171 | 'be set in LocalSettings.php' ); |
| — | — | @@ -214,10 +204,8 @@ |
| 215 | 205 | */ |
| 216 | 206 | function testApiListPages( CookieJar $cj ) { |
| 217 | 207 | $this->markTestIncomplete( "Not done with this yet" ); |
| 218 | | - global $wgServerName, $wgServer, $wgDBprefix, $wgDBtype; |
| | 208 | + global $wgServerName, $wgServer; |
| 219 | 209 | |
| 220 | | - if ( $wgDBprefix === "parsertest_" || ( $wgDBtype == 'oracle' && $wgDBprefix === 'pt_' ) ) |
| 221 | | - $this->markTestSkipped( "This test can't (yet?) be run with the parser tests" ); |
| 222 | 210 | if ( $wgServerName == "localhost" || $wgServer == "http://localhost" ) { |
| 223 | 211 | $this->markTestIncomplete( 'This test needs $wgServerName and $wgServer to ' . |
| 224 | 212 | 'be set in LocalSettings.php' ); |