[PATCH 8/8] filter-subunit: Drop support for allow_empty_output hack.

Matthieu Patou mat at samba.org
Thu Oct 16 00:14:24 MDT 2014


On Sun, Oct 12, 2014 at 09:19:04PM -0700, Jelmer Vernooij wrote:
> Change-Id: If4f336ef770202dcf69484b9bccc6c0c80bd5f9b
> Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
> ---
>  selftest/selftesthelpers.py | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
> index 40e38aa..d1b3e13 100644
> --- a/selftest/selftesthelpers.py
> +++ b/selftest/selftesthelpers.py
> @@ -90,7 +90,7 @@ def valgrindify(cmdline):
>      return valgrind + " " + cmdline
>  
>  
> -def plantestsuite(name, env, cmdline, allow_empty_output=False):
> +def plantestsuite(name, env, cmdline):
>      """Plan a test suite.
>  
>      :param name: Testsuite name
> @@ -102,17 +102,13 @@ def plantestsuite(name, env, cmdline, allow_empty_output=False):
>      print env
>      if isinstance(cmdline, list):
>          cmdline = " ".join(cmdline)
> -    filter_subunit_args = []
> -    if not allow_empty_output:
> -        filter_subunit_args.append("--fail-on-empty")
> +    filter_subunit_args = ["--fail-on-empty"]
>      if "$LISTOPT" in cmdline:
>          filter_subunit_args.append("$LISTOPT")
>      print "%s 2>&1 | %s/selftest/filter-subunit %s --prefix=\"%s.\" --suffix=\"(%s)\"" % (cmdline,
>                                                                          srcdir(),
>                                                                          " ".join(filter_subunit_args),
>                                                                          name, env)
> -    if allow_empty_output:
> -        print >>sys.stderr, "WARNING: allowing empty subunit output from %s" % name
>  
>  
>  def add_prefix(prefix, env, support_list=False):
> -- 
> 2.1.1
> 
Reviewed-by: Matthieu Patou <mat at matws.net>
-- 
Matthieu Patou
Samba Team
http://samba.org


More information about the samba-technical mailing list