1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
This commit is contained in:
Joas Schilling
2014-09-17 21:25:20 +02:00
2 changed files with 2 additions and 27 deletions

View File

@@ -118,17 +118,9 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case
$this->db_tools->sql_column_remove('phpbb_config', 'extra_column');
}
/**
* @expectedException \phpbb\db\migration\exception
*/
public function test_unfulfillable_exception()
{
$this->migrator->set_migrations(array('phpbb_dbal_migration_unfulfillable', 'phpbb_dbal_migration_dummy'));
}
public function test_unfulfillable()
{
$this->migrator->set_migrations(array('phpbb_dbal_migration_unfulfillable', 'phpbb_dbal_migration_dummy'), false);
$this->migrator->set_migrations(array('phpbb_dbal_migration_unfulfillable', 'phpbb_dbal_migration_dummy'));
while (!$this->migrator->finished())
{