##// END OF EJS Templates
run-tests: remove options from Test.__init__...
Gregory Szorc -
r21518:8e8049b9 default
parent child Browse files
Show More
@@ -338,15 +338,13 b' class Test(unittest.TestCase):'
338 # Status code reserved for skipped tests (used by hghave).
338 # Status code reserved for skipped tests (used by hghave).
339 SKIPPED_STATUS = 80
339 SKIPPED_STATUS = 80
340
340
341 def __init__(self, options, path, tmpdir, abort, keeptmpdir=False,
341 def __init__(self, path, tmpdir, abort, keeptmpdir=False,
342 debug=False, nodiff=False, diffviewer=None,
342 debug=False, nodiff=False, diffviewer=None,
343 interactive=False, timeout=defaults['timeout'],
343 interactive=False, timeout=defaults['timeout'],
344 startport=defaults['port'], extraconfigopts=None,
344 startport=defaults['port'], extraconfigopts=None,
345 py3kwarnings=False, shell=None):
345 py3kwarnings=False, shell=None):
346 """Create a test from parameters.
346 """Create a test from parameters.
347
347
348 options are parsed command line options that control test execution.
349
350 path is the full path to the file defining the test.
348 path is the full path to the file defining the test.
351
349
352 tmpdir is the main temporary directory to use for this test.
350 tmpdir is the main temporary directory to use for this test.
@@ -389,7 +387,6 b' class Test(unittest.TestCase):'
389 self._testdir = os.path.dirname(path)
387 self._testdir = os.path.dirname(path)
390 self.errpath = os.path.join(self._testdir, '%s.err' % self.name)
388 self.errpath = os.path.join(self._testdir, '%s.err' % self.name)
391
389
392 self._options = options
393 self._threadtmp = tmpdir
390 self._threadtmp = tmpdir
394 self._abort = abort
391 self._abort = abort
395 self._keeptmpdir = keeptmpdir
392 self._keeptmpdir = keeptmpdir
@@ -1521,7 +1518,7 b' class TestRunner(object):'
1521 refpath = os.path.join(self.testdir, test)
1518 refpath = os.path.join(self.testdir, test)
1522 tmpdir = os.path.join(self.hgtmp, 'child%d' % count)
1519 tmpdir = os.path.join(self.hgtmp, 'child%d' % count)
1523
1520
1524 return testcls(self.options, refpath, tmpdir, self.abort,
1521 return testcls(refpath, tmpdir, self.abort,
1525 keeptmpdir=self.options.keep_tmpdir,
1522 keeptmpdir=self.options.keep_tmpdir,
1526 debug=self.options.debug,
1523 debug=self.options.debug,
1527 nodiff = self.options.nodiff,
1524 nodiff = self.options.nodiff,
General Comments 0
You need to be logged in to leave comments. Login now