From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 16:51:04 +0000 (+0100)
Subject: Thu May 31 23:00:00 BST 2012  david-sarah@jacaranda.org
X-Git-Url: https://git.rkrishnan.org/pf/content/$sch_link?a=commitdiff_plain;h=0fd9228fbc95686d8b959b00f68f8cf6f90d081a;p=tahoe-lafs%2Ftahoe-lafs.git

Thu May 31 23:00:00 BST 2012  david-sarah@jacaranda.org
  * 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
---

diff --git a/setup.py b/setup.py
index 72ef1f96..559a934d 100644
--- a/setup.py
+++ b/setup.py
@@ -187,14 +187,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
@@ -207,8 +209,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: