@matheusbsbs / matheus-bagliano / commits / d223e85407
Fork 0

t3200: don't grep for `strerror()` string

In 6b7093064a ("t3200: test for specific errors", 2020-06-15), we learned to grep stderr to ensure that the failing `git branch` invocations fail for the right reason. In two of these tests, we grep for "File exists", expecting the string to show up there since config.c calls `error_errno()`, which ends up including `strerror(errno)` in the error message. But as we saw in 4605a73073 ("t1091: don't grep for `strerror()` string", 2020-03-08), there exists at least one implementation where `strerror()` yields a slightly different string than the one we're grepping for. In particular, these tests fail on the NonStop platform. Similar to 4605a73073, grep for the beginning of the string instead to avoid relying on `strerror()` behavior. Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Martin Ågren committed Jul 18, 2020 at 11:48 UTC d223e85407f75ffb562b6f7b5f33b6135607977a
1 file changed +2 -2
t/t3200-branch.sh
+2 -2
@@ -870,7 +870,7 @@ test_expect_success '--set-upstream-to fails on locked config' '
870 >.git/config.lock &&
871 git branch locked &&
872 test_must_fail git branch --set-upstream-to locked 2>err &&
873 - test_i18ngrep "could not lock config file .git/config: File exists" err
873 + test_i18ngrep "could not lock config file .git/config" err
874 '
875
876 test_expect_success 'use --set-upstream-to modify HEAD' '
@@ -901,7 +901,7 @@ test_expect_success '--unset-upstream should fail if config is locked' '
901 git branch --set-upstream-to locked &&
902 >.git/config.lock &&
903 test_must_fail git branch --unset-upstream 2>err &&
904 - test_i18ngrep "could not lock config file .git/config: File exists" err
904 + test_i18ngrep "could not lock config file .git/config" err
905 '
906
907 test_expect_success 'test --unset-upstream on HEAD' '