From 981b81c43d4f9fc1ed6a77cf49af9633bd17e44f Mon Sep 17 00:00:00 2001 From: Matt Button Date: Wed, 13 Jul 2011 14:19:13 -0700 Subject: [PATCH 1/3] Don't exit with a zero status code on migration failure, fixes #27 --- classes/minion/task/migrations/run.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/minion/task/migrations/run.php b/classes/minion/task/migrations/run.php index 7b2c635..cdc75d6 100644 --- a/classes/minion/task/migrations/run.php +++ b/classes/minion/task/migrations/run.php @@ -110,9 +110,11 @@ class Minion_Task_Migrations_Run extends Minion_Task } catch(Minion_Migration_Exception $e) { - return View::factory('minion/task/migrations/run/exception') + echo View::factory('minion/task/migrations/run/exception') ->set('migration', $e->get_migration()) ->set('error', $e->getMessage()); + + exit(2); } $view = View::factory('minion/task/migrations/run') From b2e1af6b7139534770e027d0a1c95bdf3847ae53 Mon Sep 17 00:00:00 2001 From: Matt Button Date: Wed, 13 Jul 2011 22:31:22 +0100 Subject: [PATCH 2/3] Rethrow exception if migration fails, refs #27 --- classes/minion/task/migrations/run.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/minion/task/migrations/run.php b/classes/minion/task/migrations/run.php index cdc75d6..dd74fef 100644 --- a/classes/minion/task/migrations/run.php +++ b/classes/minion/task/migrations/run.php @@ -114,7 +114,7 @@ class Minion_Task_Migrations_Run extends Minion_Task ->set('migration', $e->get_migration()) ->set('error', $e->getMessage()); - exit(2); + throw $e; } $view = View::factory('minion/task/migrations/run') From c1c96ffde3c5d0ee5eba0c2925fa712fb8903958 Mon Sep 17 00:00:00 2001 From: Lorenzo Pisani Date: Tue, 19 Jul 2011 11:37:34 -0700 Subject: [PATCH 3/3] fixing comments in unittests --- tests/minion/migration/model.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/minion/migration/model.php b/tests/minion/migration/model.php index 5a69223..ea6d788 100644 --- a/tests/minion/migration/model.php +++ b/tests/minion/migration/model.php @@ -525,11 +525,11 @@ class Minion_Migration_ModelTest extends Kohana_Unittest_Database_TestCase } /** - * Test that Minion_Migration_Util::compile_migrations_from_files accurately + * Test that Model_Minion_Migration::compile_migrations_from_files accurately * compiles a set of files down into a set of migration files * * @test - * @covers Minion_Migration_Util::compile_migrations_from_files + * @covers Model_Minion_Migration::compile_migrations_from_files * @dataProvider provider_compile_migrations_from_files * @param array Expected output * @param array Input Files @@ -563,11 +563,11 @@ class Minion_Migration_ModelTest extends Kohana_Unittest_Database_TestCase } /** - * Tests that Minion_Migration_Util::get_migration_info_from_filename() + * Tests that Model_Minion_Migration::get_migration_info_from_filename() * correctly extracts information about the migration from its filename * * @test - * @covers Minion_Migration_Util::get_migration_from_filename + * @covers Model_Minion_Migration::get_migration_from_filename * @dataProvider provider_get_migration_from_filename * @param array Expected output * @param string Input filename @@ -602,11 +602,11 @@ class Minion_Migration_ModelTest extends Kohana_Unittest_Database_TestCase } /** - * Tests that Minion_Migration_Util::get_filename_from_migration generates + * Tests that Model_Minion_Migration::get_filename_from_migration generates * accurate filenames when given a variety of migration information * * @test - * @covers Minion_Migration_Util::get_filename_from_migration + * @covers Model_Minion_Migration::get_filename_from_migration * @dataProvider provider_get_filename_from_migration * @param string Expected output * @param mixed Migration id @@ -640,11 +640,11 @@ class Minion_Migration_ModelTest extends Kohana_Unittest_Database_TestCase } /** - * Tests that Minion_Migration_Util::get_class_from_migration can generate + * Tests that Model_Minion_Migration::get_class_from_migration can generate * a class name from information about a migration * * @test - * @covers Minion_Migration_Util::get_class_from_migration + * @covers Model_Minion_Migration::get_class_from_migration * @dataProvider provider_get_class_from_migration * @param string Expected output * @param string|array Migration info