Commit 6183f0e2b2a42d6715f3d0d85fbc41d170328ad1
2012-06-07T14:55:24
merge: cleanup tests
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
diff --git a/tests-clar/revwalk/mergebase.c b/tests-clar/revwalk/mergebase.c
index e807e3a..54ddeaf 100644
--- a/tests-clar/revwalk/mergebase.c
+++ b/tests-clar/revwalk/mergebase.c
@@ -16,9 +16,9 @@ void test_revwalk_mergebase__single1(void)
{
git_oid result, one, two, expected;
- git_oid_fromstr(&one, "c47800c7266a2be04c571c04d5a6614691ea99bd ");
- git_oid_fromstr(&two, "9fd738e8f7967c078dceed8190330fc8648ee56a");
- git_oid_fromstr(&expected, "5b5b025afb0b4c913b4c338a42934a3863bf3644");
+ cl_git_pass(git_oid_fromstr(&one, "c47800c7266a2be04c571c04d5a6614691ea99bd "));
+ cl_git_pass(git_oid_fromstr(&two, "9fd738e8f7967c078dceed8190330fc8648ee56a"));
+ cl_git_pass(git_oid_fromstr(&expected, "5b5b025afb0b4c913b4c338a42934a3863bf3644"));
cl_git_pass(git_merge_base(&result, _repo, &one, &two));
cl_assert(git_oid_cmp(&result, &expected) == 0);
@@ -28,9 +28,9 @@ void test_revwalk_mergebase__single2(void)
{
git_oid result, one, two, expected;
- git_oid_fromstr(&one, "763d71aadf09a7951596c9746c024e7eece7c7af");
- git_oid_fromstr(&two, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
- git_oid_fromstr(&expected, "c47800c7266a2be04c571c04d5a6614691ea99bd");
+ cl_git_pass(git_oid_fromstr(&one, "763d71aadf09a7951596c9746c024e7eece7c7af"));
+ cl_git_pass(git_oid_fromstr(&two, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"));
+ cl_git_pass(git_oid_fromstr(&expected, "c47800c7266a2be04c571c04d5a6614691ea99bd"));
cl_git_pass(git_merge_base(&result, _repo, &one, &two));
cl_assert(git_oid_cmp(&result, &expected) == 0);
@@ -40,9 +40,9 @@ void test_revwalk_mergebase__merged_branch(void)
{
git_oid result, one, two, expected;
- git_oid_fromstr(&one, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
- git_oid_fromstr(&two, "9fd738e8f7967c078dceed8190330fc8648ee56a");
- git_oid_fromstr(&expected, "9fd738e8f7967c078dceed8190330fc8648ee56a");
+ cl_git_pass(git_oid_fromstr(&one, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"));
+ cl_git_pass(git_oid_fromstr(&two, "9fd738e8f7967c078dceed8190330fc8648ee56a"));
+ cl_git_pass(git_oid_fromstr(&expected, "9fd738e8f7967c078dceed8190330fc8648ee56a"));
cl_git_pass(git_merge_base(&result, _repo, &one, &two));
cl_assert(git_oid_cmp(&result, &expected) == 0);
@@ -53,12 +53,11 @@ void test_revwalk_mergebase__merged_branch(void)
void test_revwalk_mergebase__no_common_ancestor_returns_ENOTFOUND(void)
{
- git_oid result, one, two, expected;
+ git_oid result, one, two;
int error;
- git_oid_fromstr(&one, "763d71aadf09a7951596c9746c024e7eece7c7af");
- git_oid_fromstr(&two, "e90810b8df3e80c413d903f631643c716887138d");
- git_oid_fromstr(&expected, "c47800c7266a2be04c571c04d5a6614691ea99bd");
+ cl_git_pass(git_oid_fromstr(&one, "763d71aadf09a7951596c9746c024e7eece7c7af"));
+ cl_git_pass(git_oid_fromstr(&two, "e90810b8df3e80c413d903f631643c716887138d"));
error = git_merge_base(&result, _repo, &one, &two);
cl_git_fail(error);