From 972bcb1c428810d2ca2a1feebb7fbd24794e1e43 Mon Sep 17 00:00:00 2001 From: david-sarah <david-sarah@jacaranda.org> Date: Thu, 31 May 2012 22:00:00 +0000 Subject: [PATCH] Change 'setup.py test' and 'setup.py trial' to pass --rterrors to trial by default. Suppress using --no-rterrors. Also pass --until-failure/-u to trial. fixes #1699 --- setup.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 0fae1363..666e9578 100644 --- a/setup.py +++ b/setup.py @@ -167,14 +167,16 @@ tests_require=[] class Trial(Command): description = "run trial (use 'bin%stahoe debug trial' for the full set of trial options)" % (os.sep,) # This is just a subset of the most useful options, for compatibility. - user_options = [ ("rterrors", "e", "Print out tracebacks as soon as they occur."), + user_options = [ ("no-rterrors", None, "Don't print out tracebacks as they occur."), + ("until-failure", "u", "Repeat a test (specified by -s) until it fails."), ("reporter=", None, "The reporter to use for this test run."), ("suite=", "s", "Specify the test suite."), ("quiet", None, "Don't display version numbers and paths of Tahoe dependencies."), ] def initialize_options(self): - self.rterrors = False + self.no_rterrors = False + self.until_failure = False self.reporter = None self.suite = "allmydata" self.quiet = False @@ -187,8 +189,10 @@ class Trial(Command): if not self.quiet: args.append('--version-and-path') args += ['debug', 'trial'] - if self.rterrors: + if not self.no_rterrors: args.append('--rterrors') + if self.until_failure: + args.append('--until-failure') if self.reporter: args.append('--reporter=' + self.reporter) if self.suite: -- 2.45.2