##// END OF EJS Templates
test: fix self._testdir to use the right mercurial library during testing...
Sangeet Kumar Mishra -
r40522:78e5b9d8 default
parent child Browse files
Show More
@@ -2543,17 +2543,18 b' class TestRunner(object):'
2543 os.umask(oldmask)
2543 os.umask(oldmask)
2544
2544
2545 def _run(self, testdescs):
2545 def _run(self, testdescs):
2546 testdir = getcwdb()
2546 self._testdir = osenvironb[b'TESTDIR'] = getcwdb()
2547 self._testdir = osenvironb[b'TESTDIR'] = getcwdb()
2547 # assume all tests in same folder for now
2548 # assume all tests in same folder for now
2548 if testdescs:
2549 if testdescs:
2549 pathname = os.path.dirname(testdescs[0]['path'])
2550 pathname = os.path.dirname(testdescs[0]['path'])
2550 if pathname:
2551 if pathname:
2551 osenvironb[b'TESTDIR'] = os.path.join(osenvironb[b'TESTDIR'],
2552 testdir = os.path.join(testdir, pathname)
2552 pathname)
2553 self._testdir = osenvironb[b'TESTDIR'] = testdir
2553 if self.options.outputdir:
2554 if self.options.outputdir:
2554 self._outputdir = canonpath(_bytespath(self.options.outputdir))
2555 self._outputdir = canonpath(_bytespath(self.options.outputdir))
2555 else:
2556 else:
2556 self._outputdir = self._testdir
2557 self._outputdir = getcwdb()
2557 if testdescs and pathname:
2558 if testdescs and pathname:
2558 self._outputdir = os.path.join(self._outputdir, pathname)
2559 self._outputdir = os.path.join(self._outputdir, pathname)
2559 previoustimes = {}
2560 previoustimes = {}
@@ -2901,7 +2902,7 b' class TestRunner(object):'
2901 testcls = cls
2902 testcls = cls
2902 break
2903 break
2903
2904
2904 refpath = os.path.join(self._testdir, path)
2905 refpath = os.path.join(getcwdb(), path)
2905 tmpdir = os.path.join(self._hgtmp, b'child%d' % count)
2906 tmpdir = os.path.join(self._hgtmp, b'child%d' % count)
2906
2907
2907 # extra keyword parameters. 'case' is used by .t tests
2908 # extra keyword parameters. 'case' is used by .t tests
General Comments 0
You need to be logged in to leave comments. Login now