Patchwork run-tests: ignoring tests works again

login
register
mail settings
Submitter Simon Heimberg
Date June 10, 2013, 4:49 p.m.
Message ID <a3645a98eda5ab9cfe5e.1370882960@lapsi.heimberg.home>
Download mbox | patch
Permalink /patch/1715/
State Accepted
Commit ad16e5c7a4297650a389c0f363deeddf7fe5ca8b
Headers show

Comments

Simon Heimberg - June 10, 2013, 4:49 p.m.
# HG changeset patch
# User simon@laptop-tosh
# Date 1370788975 -7200
# Node ID a3645a98eda5ab9cfe5eba4a3ccda6745d5f3fef
# Parent  c38b726c2d54d6e03a5c40bee15146903522776c
run-tests: ignoring tests works again

running with --retest did not work anymore because runone still returned None
for this case. But this is not allowed since 6a127fa5de23.
Matt Mackall - June 12, 2013, 9:04 p.m.
On Mon, 2013-06-10 at 18:49 +0200, Simon Heimberg wrote:
> # HG changeset patch
> # User simon@laptop-tosh
> # Date 1370788975 -7200
> # Node ID a3645a98eda5ab9cfe5eba4a3ccda6745d5f3fef
> # Parent  c38b726c2d54d6e03a5c40bee15146903522776c
> run-tests: ignoring tests works again

Queued for default, thanks.

Patch

diff -r c38b726c2d54 -r a3645a98eda5 tests/run-tests.py
--- a/tests/run-tests.py	Sam Jun 08 22:37:08 2013 +0200
+++ b/tests/run-tests.py	Son Jun 09 16:42:55 2013 +0200
@@ -907,8 +907,7 @@ 
             return skip("blacklisted")
 
         if options.retest and not os.path.exists(test + ".err"):
-            ignore("not retesting")
-            return None
+            return ignore("not retesting")
 
         if options.keywords:
             fp = open(test)
@@ -918,8 +917,7 @@ 
                 if k in t:
                     break
                 else:
-                    ignore("doesn't match keyword")
-                    return None
+                    return ignore("doesn't match keyword")
 
     for ext, func, out in testtypes:
         if lctest.startswith("test-") and lctest.endswith(ext):