| Index: trunk/phase3/tests/phpunit/includes/ConcurrencyCheckTest.php |
| — | — | @@ -54,6 +54,7 @@ |
| 55 | 55 | $second->checkin($testKey); |
| 56 | 56 | |
| 57 | 57 | // tests |
| | 58 | + /* turning these tests off per robla, since I need to go home. |
| 58 | 59 | $this->assertTrue( $first->checkout($testKey), "Initial checkout" ); |
| 59 | 60 | $this->assertTrue( $first->checkout($testKey), "Cache hit" ); |
| 60 | 61 | $this->assertFalse( $second->checkout($testKey), "Checkout of locked resource fails as different user" ); |
| — | — | @@ -66,9 +67,11 @@ |
| 67 | 68 | $this->assertTrue( $first->checkout($testKey), "Checkout of expired resource succeeds as first user"); |
| 68 | 69 | $this->assertTrue( $second->checkout($testKey, true), "Checkout override" ); |
| 69 | 70 | $this->assertFalse( $first->checkout($testKey), "Checkout of overriden resource fails as different user" ); |
| | 71 | + |
| 70 | 72 | |
| 71 | 73 | // cleanup |
| 72 | 74 | $this->assertTrue( $second->checkin($testKey), "Checkin of record with changed ownership" ); |
| | 75 | + */ |
| 73 | 76 | } |
| 74 | 77 | |
| 75 | 78 | public function testExpire() { |
| Index: trunk/phase3/tests/phpunit/includes/api/ApiConcurrencyTest.php |
| — | — | @@ -77,7 +77,8 @@ |
| 78 | 78 | global $wgUser; |
| 79 | 79 | |
| 80 | 80 | $wgUser = self::$users['one']->user; |
| 81 | | - |
| | 81 | + /* commenting these out since i need to go home and they're breakin CI. See commit summary for details. |
| | 82 | + |
| 82 | 83 | list( $result, , $session ) = $this->doApiRequestWithToken( array( |
| 83 | 84 | 'action' => 'concurrency', |
| 84 | 85 | 'ccaction' => 'checkout', |
| — | — | @@ -103,7 +104,7 @@ |
| 104 | 105 | 'resourcetype' => 'responding-to-moodbar-feedback'), $sessionArray['two'], self::$users['two']->user ); |
| 105 | 106 | |
| 106 | 107 | $this->assertEquals( "success", $result['concurrency']['result'] ); |
| 107 | | - |
| | 108 | + */ |
| 108 | 109 | } |
| 109 | 110 | |
| 110 | 111 | /** |
| — | — | @@ -114,6 +115,7 @@ |
| 115 | 116 | global $wgUser; |
| 116 | 117 | |
| 117 | 118 | $wgUser = self::$users['one']->user; |
| | 119 | + /* commenting these out since i need to go home and they're breakin CI. See commit summary for details. |
| 118 | 120 | |
| 119 | 121 | list( $result, , $session ) = $this->doApiRequestWithToken( array( |
| 120 | 122 | 'action' => 'concurrency', |
| — | — | @@ -140,7 +142,7 @@ |
| 141 | 143 | 'resourcetype' => 'responding-to-moodbar-feedback'), $sessionArray['two'], self::$users['two']->user ); |
| 142 | 144 | |
| 143 | 145 | $this->assertEquals( "success", $result['concurrency']['result'] ); |
| 144 | | - |
| | 146 | + */ |
| 145 | 147 | } |
| 146 | 148 | |
| 147 | 149 | /** |