Patchwork [2,of,2,V3,stable] run-tests: fixes the '--interactive' option error

login
register
mail settings
Submitter Anurag Goel
Date June 13, 2014, 9:24 a.m.
Message ID <477bc39f2d88a7d38127.1402651462@ubuntu.ubuntu-domain>
Download mbox | patch
Permalink /patch/4986/
State Accepted
Commit 7e14d026c4c4951b0feffedcf88a41056974e3b0
Headers show

Comments

Anurag Goel - June 13, 2014, 9:24 a.m.
# HG changeset patch
# User anuraggoel <anurag.dsps@gmail.com>
# Date 1402650923 -19800
#      Fri Jun 13 14:45:23 2014 +0530
# Node ID 477bc39f2d88a7d38127a3509d3d85cc9b62faee
# Parent  ef9bd057d520d30d993c73f4b3b65e3c908039b3
run-tests: fixes the '--interactive' option error

This patch fixes a regression recently introduced by a refactoring.

Previously when failure occurs while testing with '--interactive' was enable,
it didn't prompt user by asking whether he wants to accept this failure
changes or not.

This was happening beacuse of the 'if' condition
if ret or not self._options.interactive or \
not os.path.exists(test.errpath):

Everytime failure occurs, this condition gets true and returns back even
when '--interactive' is enabled. This condition don't led the function to
execute further, which consist the '--interactive' functionality.

Now, on failure with '--interactive' enabled, it prompts user whether he wants
to accepts failure changes or not.
If yes then test gets passed  and returns true, else test gets failed.

On every failure, results gets stored in "self.failures.append((test, reason))"
But if failure changes accepted by user then test must get "pop out" from
failed test list.
Pierre-Yves David - June 13, 2014, 10:12 p.m.
On 06/13/2014 02:24 AM, Anurag Goel wrote:
> # HG changeset patch
> # User anuraggoel <anurag.dsps@gmail.com>
> # Date 1402650923 -19800
> #      Fri Jun 13 14:45:23 2014 +0530
> # Node ID 477bc39f2d88a7d38127a3509d3d85cc9b62faee
> # Parent  ef9bd057d520d30d993c73f4b3b65e3c908039b3
> run-tests: fixes the '--interactive' option error

I just pushed those two with the last two tests changeset.

(queued)

Patch

diff -r ef9bd057d520 -r 477bc39f2d88 tests/run-tests.py
--- a/tests/run-tests.py	Fri Jun 13 14:33:02 2014 +0530
+++ b/tests/run-tests.py	Fri Jun 13 14:45:23 2014 +0530
@@ -1079,6 +1079,20 @@ 
         else:
             if not self._options.nodiff:
                 self.stream.write('\nERROR: %s output changed\n' % test)
+
+            if self._options.interactive:
+                iolock.acquire()
+                self.stream.write('Accept this change? [n] ')
+                answer = sys.stdin.readline().strip()
+                iolock.release()
+                if answer.lower() in ('y', 'yes'):
+                    if test.name.endswith('.t'):
+                        rename(test.errpath, test.path)
+                    else:
+                        rename(test.errpath, '%s.out' % test.path)
+                    self.failures.pop()
+                    return 1
+
             self.stream.write('!')
 
     def addError(self, *args, **kwargs):
@@ -1142,16 +1156,6 @@ 
             not os.path.exists(test.errpath):
             return
 
-        iolock.acquire()
-        print 'Accept this change? [n] ',
-        answer = sys.stdin.readline().strip()
-        iolock.release()
-        if answer.lower() in ('y', 'yes'):
-            if test.name.endswith('.t'):
-                rename(test.errpath, test.path)
-            else:
-                rename(test.errpath, '%s.out' % test.path)
-
     def startTest(self, test):
         super(TestResult, self).startTest(test)