From 16416b2eeff2eed1c7d7e6eb2f233c733c908475 Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Wed, 31 Aug 2016 17:01:46 +0200 Subject: [PATCH] Error on invalid list parameter combination pdb and no_discover cannot be combined with black or white lists, it was documented, but not checked. Change-Id: I7168aef00505cb94051e2e587381efba9fd3e445 --- os_testr/ostestr.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/os_testr/ostestr.py b/os_testr/ostestr.py index 3a7a8fa..603f7b6 100755 --- a/os_testr/ostestr.py +++ b/os_testr/ostestr.py @@ -268,7 +268,11 @@ def main(): msg = "You can not use until_failure mode with pdb or no-discover" print(msg) exit(5) - + if ((opts.pdb or opts.no_discover) and + (opts.blacklist_file or opts.whitelist_file)): + msg = "You can not use blacklist or whitelist with pdb or no-discover" + print(msg) + exit(6) if ((opts.pdb or opts.no_discover) and (opts.black_regex)): msg = "You can not use black-regex with pdb or no-discover" print(msg)