From 97ba6261a8eb7f94963ecc91043e5a2d54ffd248 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 15 May 2021 21:33:43 +0200 Subject: git update auto change to edge branch (#3589) * git update auto change to edge branch For existing installations using automatic git update, checkout *edge* branch if it was still using *master* or *dev*. * One more prune * Fix several small issues * theirs does not work here * Use migration mechanism * Better handling of Migration errors * Test details * Fix tests * Do not use new migration system for now --- tests/lib/Minz/MigratorTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/lib/Minz/MigratorTest.php b/tests/lib/Minz/MigratorTest.php index d4b1e030c..dec1d0176 100644 --- a/tests/lib/Minz/MigratorTest.php +++ b/tests/lib/Minz/MigratorTest.php @@ -310,9 +310,10 @@ class MigratorTest extends TestCase public function testExecuteFailsIfAMigrationIsFailing() { $migrations_path = TESTS_PATH . '/fixtures/migrations_with_failing/'; $applied_migrations_path = tempnam('/tmp', 'applied_migrations.txt'); - $expected_result = 'A migration failed to be applied, please see previous logs'; + $expected_result = 'A migration failed to be applied, please see previous logs.'; $result = Minz_Migrator::execute($migrations_path, $applied_migrations_path); + list($result, ) = explode("\n", $result, 2); $this->assertSame($expected_result, $result); $versions = file_get_contents($applied_migrations_path); -- cgit v1.2.3