Commit 0e95e70a55b2c7af64370c0b886d4d00f8bea839
2012-11-17T05:22:39
env: ensure git_futils_find_xxx() returns ENOTFOUND
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/tests-clar/core/env.c b/tests-clar/core/env.c
index 288222d..d849f76 100644
--- a/tests-clar/core/env.c
+++ b/tests-clar/core/env.c
@@ -84,13 +84,15 @@ void test_core_env__0(void)
cl_git_mkfile(path.ptr, "find me");
git_buf_rtruncate_at_char(&path, '/');
- cl_git_fail(git_futils_find_global_file(&found, testfile));
+ cl_assert_equal_i(
+ GIT_ENOTFOUND, git_futils_find_global_file(&found, testfile));
setenv_and_check("HOME", path.ptr);
cl_git_pass(git_futils_find_global_file(&found, testfile));
cl_setenv("HOME", env_save[0]);
- cl_git_fail(git_futils_find_global_file(&found, testfile));
+ cl_assert_equal_i(
+ GIT_ENOTFOUND, git_futils_find_global_file(&found, testfile));
#ifdef GIT_WIN32
setenv_and_check("HOMEDRIVE", NULL);
@@ -106,7 +108,8 @@ void test_core_env__0(void)
if (root >= 0) {
setenv_and_check("USERPROFILE", NULL);
- cl_git_fail(git_futils_find_global_file(&found, testfile));
+ cl_assert_equal_i(
+ GIT_ENOTFOUND, git_futils_find_global_file(&found, testfile));
old = path.ptr[root];
path.ptr[root] = '\0';
@@ -128,7 +131,8 @@ void test_core_env__1(void)
{
git_buf path = GIT_BUF_INIT;
- cl_must_fail(git_futils_find_global_file(&path, "nonexistentfile"));
+ cl_assert_equal_i(
+ GIT_ENOTFOUND, git_futils_find_global_file(&path, "nonexistentfile"));
cl_git_pass(cl_setenv("HOME", "doesnotexist"));
#ifdef GIT_WIN32
@@ -136,7 +140,8 @@ void test_core_env__1(void)
cl_git_pass(cl_setenv("USERPROFILE", "doesnotexist"));
#endif
- cl_must_fail(git_futils_find_global_file(&path, "nonexistentfile"));
+ cl_assert_equal_i(
+ GIT_ENOTFOUND, git_futils_find_global_file(&path, "nonexistentfile"));
cl_git_pass(cl_setenv("HOME", NULL));
#ifdef GIT_WIN32
@@ -144,13 +149,16 @@ void test_core_env__1(void)
cl_git_pass(cl_setenv("USERPROFILE", NULL));
#endif
- cl_must_fail(git_futils_find_global_file(&path, "nonexistentfile"));
+ cl_assert_equal_i(
+ GIT_ENOTFOUND, git_futils_find_global_file(&path, "nonexistentfile"));
- cl_must_fail(git_futils_find_system_file(&path, "nonexistentfile"));
+ cl_assert_equal_i(
+ GIT_ENOTFOUND, git_futils_find_system_file(&path, "nonexistentfile"));
#ifdef GIT_WIN32
cl_git_pass(cl_setenv("PROGRAMFILES", NULL));
- cl_must_fail(git_futils_find_system_file(&path, "nonexistentfile"));
+ cl_assert_equal_i(
+ GIT_ENOTFOUND, git_futils_find_system_file(&path, "nonexistentfile"));
#endif
git_buf_free(&path);