sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

s4/tests: Move command line processing into separate method to be reused

Browse Source
This commit is contained in:
Kamen Mazdrashki
2011-02-09 03:40:17 +02:00
parent 6b1574636a
commit 099644f0a7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source4/scripting/python/samba/tests/__init__.py
View File

@ -124,20 +124,20 @@ class ValidNetbiosNameTests(TestCase):
class BlackboxTestCase(TestCase):
"""Base test case for blackbox tests."""
def check_run(self, line):
def _make_cmdline(self, line):
bindir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../../bin"))
parts = line.split(" ")
if os.path.exists(os.path.join(bindir, parts[0])):
parts[0] = os.path.join(bindir, parts[0])
line = " ".join(parts)
return line
def check_run(self, line):
line = self._make_cmdline(line)
subprocess.check_call(line, shell=True)
def check_output(self, line):
bindir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../../../bin"))
parts = line.split(" ")
if os.path.exists(os.path.join(bindir, parts[0])):
parts[0] = os.path.join(bindir, parts[0])
line = " ".join(parts)
line = self._make_cmdline(line)
p = subprocess.Popen(line, stdout=subprocess.PIPE, shell=True, close_fds=True)
retcode = p.wait()
if retcode: