Torsten Bögershausen <tbo...@web.de> writes:

> On 20.12.12 21:01, Jeff King wrote:
>> +test_fully_contains () {
>>> +   sort "$1" >expect.sorted &&
>>> +   sort "$2" >actual.sorted &&
>>> +   test $(comm -23 expect.sorted actual.sorted | wc -l) = 0
>>> +}
>
> (Good to learn about the comm command, thanks )
> What do we think about this:

Three points to consider.

 * Do _all_ tests that use test_completion not care about the actual
   order of choices that come out of the completion machinery?

 * Do _all_ tests that use test_completion not care about having
   extra choice, or is the command name completion the only odd
   case?

 * Is this still as easy to extend as the original to conditionally
   verify that all extra output share the same prefix?

> diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
> index 3cd53f8..82eeba7 100755
> --- a/t/t9902-completion.sh
> +++ b/t/t9902-completion.sh
> @@ -62,12 +62,16 @@ test_completion ()
>  {
>       if test $# -gt 1
>       then
> -             printf '%s\n' "$2" >expected
> +             printf '%s\n' "$2" | sort >expected.sorted
>       else
> -             sed -e 's/Z$//' >expected
> +             sed -e 's/Z$//' | sort >expected.sorted
>       fi &&
>       run_completion "$1" &&
> -     test_cmp expected out
> +     sort <out >actual.sorted &&
> +     >empty &&
> +     comm -23 expected.sorted actual.sorted >actual &&
> +     test_cmp empty actual &&
> +     rm empty actual
>  }
>  
>  # Test __gitcomp.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to