On Tue, Jul 27, 2010 at 23:08, Elijah Newren <newren@xxxxxxxxx> wrote:
> Hi,
>
> On Tue, Jul 27, 2010 at 10:54 AM, Ævar Arnfjörð Bjarmason
> <avarab@xxxxxxxxx> wrote:
>> Various merge-recursive cases were fixed in "merge-recursive: Fix D/F
>> conflicts" by Elijah Newren. Some tests were changed from
>> test_expect_failure to test_expect_success, but one fell through the
>> cracks.
>>
>> Change that test to use test_expect_success.
>
> Weird, I know I tested all of these individually and worked to make
> sure they all passed; I have no idea how I would have forgotten to
> update this particular test.
It still passes, but nothing flags unexpectedly passing TODO tests if
you use "make test", but if you use "prove" they're spotted.
On pu:
v t (pu) $ prove ./t6035-merge-dir-to-symlink.sh
./t6035-merge-dir-to-symlink.sh .. ok
All tests successful.
Test Summary Report
-------------------
./t6035-merge-dir-to-symlink.sh (Wstat: 0 Tests: 16 Failed: 0)
TODO passed: 8
Files=1, Tests=16, 1 wallclock secs ( 0.03 usr 0.01 sys + 0.10
cusr 0.53 csys = 0.67 CPU)
Result: PASS
With this patch:
v t (merge-dir-to-symlink-todo-test) $ prove ./t6035-merge-dir-to-symlink.sh
./t6035-merge-dir-to-symlink.sh .. ok
All tests successful.
Files=1, Tests=16, 1 wallclock secs ( 0.03 usr 0.02 sys + 0.13
cusr 0.53 csys = 0.71 CPU)
Result: PASS
The default harness / aggregate-resaults *could* be fixed to deal with
it, but I haven't been motivated to do so since prove just works :)
> Anyway, thanks for cleaning up after me. :-)
No problem.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html