summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
authorJoe Guo <joeg@catalyst.net.nz>2018-07-30 18:20:39 +1200
committerDouglas Bagnall <dbagnall@samba.org>2018-08-24 07:49:29 +0200
commit211c9a5f85bffbb012b4567bad265c9339588fbf (patch)
treed22f062161bdd07b60c6ac3bd42964ea902a402b /selftest
parent542e91ef9222302303d2ecc10dceb96d1b0d5bab (diff)
downloadsamba-211c9a5f85bffbb012b4567bad265c9339588fbf.tar.gz
PEP8: fix E302: expected 2 blank lines, found 1
Signed-off-by: Joe Guo <joeg@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'selftest')
-rw-r--r--selftest/selftesthelpers.py5
-rw-r--r--selftest/subunithelper.py1
2 files changed, 6 insertions, 0 deletions
diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index 2d6e2b12053..490bc64ebda 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -23,18 +23,23 @@ import os
import subprocess
import sys
+
def srcdir():
return os.path.normpath(os.getenv("SRCDIR", os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")))
+
def source4dir():
return os.path.normpath(os.path.join(srcdir(), "source4"))
+
def source3dir():
return os.path.normpath(os.path.join(srcdir(), "source3"))
+
def bindir():
return os.path.normpath(os.getenv("BINDIR", "./bin"))
+
def binpath(name):
return os.path.join(bindir(), name)
diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index 3ac2d963a90..830dd4ba63d 100644
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -33,6 +33,7 @@ VALID_RESULTS = set(['success', 'successful', 'failure', 'fail', 'skip',
'testsuite-success', 'testsuite-error',
'uxsuccess', 'testsuite-uxsuccess'])
+
class TestsuiteEnabledTestResult(unittest.TestResult):
def start_testsuite(self, name):