{"thread":{"id":"24539","subject":"[PATCH] t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test","startedAt":"2010-07-27T16:54:58Z","lastAt":"2010-07-28T07:31:28Z","messageCount":3,"participants":["Ævar Arnfjörð Bjarmason","Elijah Newren"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"146491","messageId":"1280249698-11001-1-git-send-email-avarab@gmail.com","threadId":"24539","inReplyTo":null,"subject":"[PATCH] t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-07-27T16:54:58Z","receivedAt":"2010-07-27T16:54:58Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Various merge-recursive cases were fixed in \"merge-recursive: Fix D/F\nconflicts\" by Elijah Newren. Some tests were changed from\ntest_expect_failure to test_expect_success, but one fell through the\ncracks.\n\nChange that test to use test_expect_success.\n---\n t/t6035-merge-dir-to-symlink.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh\nindex 272bab5..dc09513 100755\n--- a/t/t6035-merge-dir-to-symlink.sh\n+++ b/t/t6035-merge-dir-to-symlink.sh\n@@ -72,7 +72,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolv\n \ttest -f a/b-2/c/d\n '\n \n-test_expect_failure 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '\n+test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '\n \tgit reset --hard &&\n \tgit checkout master^0 &&\n \tgit merge -s recursive baseline^0 &&\n-- \n1.7.1\n"},{"id":"146550","messageId":"AANLkTikZO=RENz9HnHsiPoAv+fSz03p-zZPMepcX=KKK@mail.gmail.com","threadId":"24539","inReplyTo":"1280249698-11001-1-git-send-email-avarab@gmail.com","subject":"Re: [PATCH] t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2010-07-27T23:08:32Z","receivedAt":"2010-07-27T23:08:32Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Hi,\n\nOn Tue, Jul 27, 2010 at 10:54 AM, Ævar Arnfjörð Bjarmason\n<avarab@gmail.com> wrote:\n> Various merge-recursive cases were fixed in \"merge-recursive: Fix D/F\n> conflicts\" by Elijah Newren. Some tests were changed from\n> test_expect_failure to test_expect_success, but one fell through the\n> cracks.\n>\n> Change that test to use test_expect_success.\n\nWeird, I know I tested all of these individually and worked to make\nsure they all passed; I have no idea how I would have forgotten to\nupdate this particular test.\n\nAnyway, thanks for cleaning up after me.  :-)\n"},{"id":"146582","messageId":"AANLkTi=VBsjHJxogMiD-R+wFj6W3q2JevdfrXHWqAdKE@mail.gmail.com","threadId":"24539","inReplyTo":"AANLkTikZO=RENz9HnHsiPoAv+fSz03p-zZPMepcX=KKK@mail.gmail.com","subject":"Re: [PATCH] t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-07-28T07:31:28Z","receivedAt":"2010-07-28T07:31:28Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Tue, Jul 27, 2010 at 23:08, Elijah Newren <newren@gmail.com> wrote:\n> Hi,\n>\n> On Tue, Jul 27, 2010 at 10:54 AM, Ævar Arnfjörð Bjarmason\n> <avarab@gmail.com> wrote:\n>> Various merge-recursive cases were fixed in \"merge-recursive: Fix D/F\n>> conflicts\" by Elijah Newren. Some tests were changed from\n>> test_expect_failure to test_expect_success, but one fell through the\n>> cracks.\n>>\n>> Change that test to use test_expect_success.\n>\n> Weird, I know I tested all of these individually and worked to make\n> sure they all passed; I have no idea how I would have forgotten to\n> update this particular test.\n\nIt still passes, but nothing flags unexpectedly passing TODO tests if\nyou use \"make test\", but if you use \"prove\" they're spotted.\n\nOn pu:\n\n    v t (pu) $ prove ./t6035-merge-dir-to-symlink.sh\n    ./t6035-merge-dir-to-symlink.sh .. ok\n    All tests successful.\n\n    Test Summary Report\n    -------------------\n    ./t6035-merge-dir-to-symlink.sh (Wstat: 0 Tests: 16 Failed: 0)\n      TODO passed:   8\n    Files=1, Tests=16,  1 wallclock secs ( 0.03 usr  0.01 sys +  0.10\ncusr  0.53 csys =  0.67 CPU)\n    Result: PASS\n\nWith this patch:\n\n    v t (merge-dir-to-symlink-todo-test) $ prove ./t6035-merge-dir-to-symlink.sh\n    ./t6035-merge-dir-to-symlink.sh .. ok\n    All tests successful.\n    Files=1, Tests=16,  1 wallclock secs ( 0.03 usr  0.02 sys +  0.13\ncusr  0.53 csys =  0.71 CPU)\n    Result: PASS\n\nThe default harness / aggregate-resaults *could* be fixed to deal with\nit, but I haven't been motivated to do so since prove just works :)\n\n> Anyway, thanks for cleaning up after me.  :-)\n\nNo problem.\n"}]}