Skip to content

Commit

Permalink
tests: add missing error checks
Browse files Browse the repository at this point in the history
We should always verify error codes returned by function calls in our
test suite to not accidentally miss any weird results. Coverity reported
missing checks in several locations, which this commit fixes.
  • Loading branch information
pks-t committed Feb 7, 2020
1 parent 7d65d4c commit 2e6cbff
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 17 deletions.
2 changes: 1 addition & 1 deletion tests/config/global.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void test_config_global__lock_missing_global_config(void)
git_config_entry *entry;
git_transaction *transaction;

p_unlink("home/.gitconfig"); /* No global config */
(void)p_unlink("home/.gitconfig"); /* No global config */

cl_git_pass(git_config_open_default(&cfg));
cl_git_pass(git_config_lock(&transaction, cfg));
Expand Down
2 changes: 1 addition & 1 deletion tests/config/new.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ void test_config_new__write_new_config(void)
git_buf_dispose(&buf);
git_config_free(config);

p_unlink(TEST_CONFIG);
cl_must_pass(p_unlink(TEST_CONFIG));
}
5 changes: 2 additions & 3 deletions tests/ignore/path.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ void test_ignore_path__globs_without_star(void)
void test_ignore_path__skip_gitignore_directory(void)
{
cl_git_rewritefile("attr/.git/info/exclude", "/NewFolder\n/NewFolder/NewFolder");
p_unlink("attr/.gitignore");
cl_must_pass(p_unlink("attr/.gitignore"));
cl_assert(!git_path_exists("attr/.gitignore"));
p_mkdir("attr/.gitignore", 0777);
cl_git_mkfile("attr/.gitignore/garbage.txt", "new_file\n");
Expand All @@ -268,12 +268,11 @@ void test_ignore_path__skip_gitignore_directory(void)

void test_ignore_path__subdirectory_gitignore(void)
{
p_unlink("attr/.gitignore");
cl_must_pass(p_unlink("attr/.gitignore"));
cl_assert(!git_path_exists("attr/.gitignore"));
cl_git_mkfile(
"attr/.gitignore",
"file1\n");
p_mkdir("attr/dir", 0777);
cl_git_mkfile(
"attr/dir/.gitignore",
"file2/\n");
Expand Down
2 changes: 1 addition & 1 deletion tests/index/nsec.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static bool should_expect_nsecs(void)

expect = try_create_file_with_nsec_timestamp(nsec_path.ptr);

p_unlink(nsec_path.ptr);
cl_must_pass(p_unlink(nsec_path.ptr));

git_buf_dispose(&nsec_path);

Expand Down
3 changes: 1 addition & 2 deletions tests/index/tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,7 @@ void test_index_tests__cannot_add_invalid_filename(void)
{
git_repository *repo;

p_mkdir("invalid", 0700);

cl_must_pass(p_mkdir("invalid", 0700));
cl_git_pass(git_repository_init(&repo, "./invalid", 0));
cl_must_pass(p_mkdir("./invalid/subdir", 0777));

Expand Down
2 changes: 1 addition & 1 deletion tests/network/refspecs.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static void assert_invalid_rtransform(const char *refspec, const char *name)
git_refspec spec;
git_buf buf = GIT_BUF_INIT;

git_refspec__parse(&spec, refspec, true);
cl_git_pass(git_refspec__parse(&spec, refspec, true));
cl_git_fail(git_refspec_rtransform(&buf, &spec, name));

git_buf_dispose(&buf);
Expand Down
12 changes: 4 additions & 8 deletions tests/notes/notes.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,15 +400,11 @@ void test_notes_notes__can_read_a_note_from_a_commit(void)
git_note *note;

cl_git_pass(git_oid_fromstr(&oid, "4a202b346bb0fb0db7eff3cffeb3c70babbd2045"));

cl_git_pass(git_note_commit_create(&notes_commit_oid, NULL, _repo, NULL, _sig, _sig, &oid, "I decorate 4a20\n", 1));

git_commit_lookup(&notes_commit, _repo, &notes_commit_oid);

cl_git_pass(git_commit_lookup(&notes_commit, _repo, &notes_commit_oid));
cl_assert(notes_commit);

cl_git_pass(git_note_commit_read(&note, _repo, notes_commit, &oid));

cl_assert_equal_s(git_note_message(note), "I decorate 4a20\n");

git_commit_free(notes_commit);
Expand Down Expand Up @@ -457,7 +453,7 @@ void test_notes_notes__can_insert_a_note_in_an_existing_fanout(void)
git_note *_note;

cl_git_pass(git_oid_fromstr(&target_oid, "08b041783f40edfe12bb406c9c9a8a040177c125"));

for (i = 0; i < MESSAGES_COUNT; i++) {
cl_git_pass(git_note_create(&note_oid, _repo, "refs/notes/fanout", _sig, _sig, &target_oid, messages[i], 0));
cl_git_pass(git_note_read(&_note, _repo, "refs/notes/fanout", &target_oid));
Expand Down Expand Up @@ -511,7 +507,7 @@ void test_notes_notes__can_remove_a_note_from_commit(void)

cl_git_pass(git_note_commit_create(&notes_commit_oid, NULL, _repo, NULL, _sig, _sig, &oid, "I decorate 4a20\n", 0));

git_commit_lookup(&existing_notes_commit, _repo, &notes_commit_oid);
cl_git_pass(git_commit_lookup(&existing_notes_commit, _repo, &notes_commit_oid));

cl_assert(existing_notes_commit);

Expand Down Expand Up @@ -547,7 +543,7 @@ void test_notes_notes__removing_a_note_which_doesnt_exists_returns_ENOTFOUND(voi

cl_git_pass(git_oid_fromstr(&target_oid, "8496071c1b46c854b31185ea97743be6a8774479"));
cl_git_pass(git_note_remove(_repo, "refs/notes/fanout", _sig, _sig, &target_oid));

error = git_note_remove(_repo, "refs/notes/fanout", _sig, _sig, &target_oid);
cl_git_fail(error);
cl_assert_equal_i(GIT_ENOTFOUND, error);
Expand Down

0 comments on commit 2e6cbff

Please sign in to comment.