Conflicts:
tests/tine20/Tinebase/ControllerTest.php
Change-Id: Ia366fe87ea514e6f879c6b654432da04c1f6ae0e
Tinebase_Helper::array_value('password', TestServer::getInstance()->getTestCredentials()),
new \Zend\Http\PhpEnvironment\Request()
);
- $this->fail('expected maintenance mode exception');
+ $this->fail('expecting exception: Tinebase_Exception_MaintenanceMode');
- } catch (Tinebase_Exception $te) {
- $this->assertTrue($te instanceof Tinebase_Exception_MaintenanceMode);
+ } catch (Tinebase_Exception_MaintenanceMode $temm) {
+ $this->assertEquals('Installation is in maintenance mode. Please try again later', $temm->getMessage());
}
}