Show More
@@ -659,10 +659,10 b' class Test(unittest.TestCase):' | |||||
659 |
|
659 | |||
660 | def __init__(self, path, outputdir, tmpdir, keeptmpdir=False, |
|
660 | def __init__(self, path, outputdir, tmpdir, keeptmpdir=False, | |
661 | debug=False, |
|
661 | debug=False, | |
662 |
timeout= |
|
662 | timeout=None, | |
663 |
startport= |
|
663 | startport=None, extraconfigopts=None, | |
664 | py3kwarnings=False, shell=None, hgcommand=None, |
|
664 | py3kwarnings=False, shell=None, hgcommand=None, | |
665 |
slowtimeout= |
|
665 | slowtimeout=None, usechg=False, | |
666 | useipv6=False): |
|
666 | useipv6=False): | |
667 | """Create a test from parameters. |
|
667 | """Create a test from parameters. | |
668 |
|
668 | |||
@@ -694,6 +694,12 b' class Test(unittest.TestCase):' | |||||
694 |
|
694 | |||
695 | shell is the shell to execute tests in. |
|
695 | shell is the shell to execute tests in. | |
696 | """ |
|
696 | """ | |
|
697 | if timeout is None: | |||
|
698 | timeout = defaults['timeout'] | |||
|
699 | if startport is None: | |||
|
700 | startport = defaults['port'] | |||
|
701 | if slowtimeout is None: | |||
|
702 | slowtimeout = defaults['slowtimeout'] | |||
697 | self.path = path |
|
703 | self.path = path | |
698 | self.bname = os.path.basename(path) |
|
704 | self.bname = os.path.basename(path) | |
699 | self.name = _strpath(self.bname) |
|
705 | self.name = _strpath(self.bname) |
General Comments 0
You need to be logged in to leave comments.
Login now