[PATCH 037 of 179 tests-refactor] run-tests: move test name filter to Test.run()
Gregory Szorc
gregory.szorc at gmail.com
Fri May 2 13:37:54 CDT 2014
# HG changeset patch
# User Gregory Szorc <gregory.szorc at gmail.com>
# Date 1397966883 25200
# Sat Apr 19 21:08:03 2014 -0700
# Branch stable
# Node ID 684520300db044d417f868fa6157570b33fcae31
# Parent da0668d3b1d16d88b6788f113012d911692504fa
run-tests: move test name filter to Test.run()
diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -598,16 +598,19 @@ class Test(object):
t = f.read().lower() + self._test.lower()
f.close()
for k in options.keywords.lower().split():
if k in t:
break
else:
return self.ignore("doesn't match keyword")
+ if not os.path.basename(self._test.lower()).startswith('test-'):
+ return self.skip('not a test file')
+
# Remove any previous output files.
if os.path.exists(self._errpath):
os.remove(self._errpath)
testtmp = os.path.join(self._threadtmp, os.path.basename(self._path))
os.mkdir(testtmp)
replacements, port = self._getreplacements(testtmp)
env = self._getenv(testtmp, port)
@@ -1128,18 +1131,16 @@ def runone(options, test, count):
if options.verbose:
log("\nSkipping %s: %s" % (testpath, msg))
return 's', test, msg
testpath = os.path.join(TESTDIR, test)
err = os.path.join(TESTDIR, test + ".err")
lctest = test.lower()
- if not os.path.basename(lctest).startswith("test-"):
- return skip("not a test file")
for ext, cls, out in testtypes:
if lctest.endswith(ext):
runner = cls
ref = os.path.join(TESTDIR, test + out)
break
else:
return skip("unknown test type")
More information about the Mercurial-devel
mailing list