diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-17 21:25:20 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-17 21:25:20 +0200 |
commit | 45a4cf7ac5c8b0c0028986f9ecd141a828651e46 (patch) | |
tree | 234858c4dd075bc1b5b1b0c4b43007c3074f9285 /tests | |
parent | dd89af715154e8719cbe8955ce86f464369e2740 (diff) | |
parent | 7729ae4ad0bb09256709af37f2998a0949fbad01 (diff) | |
download | forums-45a4cf7ac5c8b0c0028986f9ecd141a828651e46.tar forums-45a4cf7ac5c8b0c0028986f9ecd141a828651e46.tar.gz forums-45a4cf7ac5c8b0c0028986f9ecd141a828651e46.tar.bz2 forums-45a4cf7ac5c8b0c0028986f9ecd141a828651e46.tar.xz forums-45a4cf7ac5c8b0c0028986f9ecd141a828651e46.zip |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
Diffstat (limited to 'tests')
-rw-r--r-- | tests/dbal/migrator_test.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index 05e60a510b..10a9444d63 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -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()) { |