sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

filter-subunit: default to empty affixes, saving verbose checks

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Douglas Bagnall 2016-08-02 11:00:27 +12:00 committed by Douglas Bagnall
parent 809f4c718a
commit 85b4a3ea61
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
selftest/filter-subunit
View File

@ -36,9 +36,9 @@ parser.add_option("--strip-passed-output", action="store_true",
help="Whether to strip output from tests that passed")
parser.add_option("--fail-immediately", action="store_true",
help="Whether to stop on the first error", default=False)
parser.add_option("--prefix", type="string",
parser.add_option("--prefix", type="string", default='',
help="Add prefix to all test names")
parser.add_option("--suffix", type="string",
parser.add_option("--suffix", type="string", default='',
help="Add suffix to all test names")
parser.add_option("--fail-on-empty", default=False,
action="store_true", help="Fail if there was no subunit output")
@ -47,14 +47,8 @@ parser.add_option("--list", default=False,
opts, args = parser.parse_args()
if opts.list:
prefix = opts.prefix
suffix = opts.suffix
if not prefix:
prefix = ""
if not suffix:
suffix = ""
for l in sys.stdin:
sys.stdout.write("%s%s%s\n" % (prefix, l.rstrip(), suffix))
sys.stdout.write("%s%s%s\n" % (opts.prefix, l.rstrip(), opts.suffix))
sys.exit(0)
if opts.expected_failures:

9
selftest/subunithelper.py
View File

@ -287,14 +287,7 @@ class FilterOps(unittest.TestResult):
self._ops.startTest(test)
def _add_prefix(self, test):
prefix = ""
suffix = ""
if self.prefix is not None:
prefix = self.prefix
if self.suffix is not None:
suffix = self.suffix
return subunit.RemotedTestCase(prefix + test.id() + suffix)
return subunit.RemotedTestCase(self.prefix + test.id() + self.suffix)
def addError(self, test, err=None):
test = self._add_prefix(test)