diff options
Diffstat (limited to 'python')
| -rwxr-xr-x | python/qpid-python-test | 12 | ||||
| -rw-r--r-- | python/qpid/tests/messaging.py | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/python/qpid-python-test b/python/qpid-python-test index 8d56311dbe..bdad3f3688 100755 --- a/python/qpid-python-test +++ b/python/qpid-python-test @@ -53,12 +53,14 @@ parser.add_option("-i", "--ignore", action="append", default=[], parser.add_option("-I", "--ignore-file", metavar="IFILE", action="append", default=[], help="ignore tests matching patterns in IFILE") +parser.add_option("-D", "--define", metavar="DEFINE", dest="defines", + action="append", default=[], help="define test parameters") class Config: def __init__(self): self.broker = URL("localhost") - self.work = None + self.defines = {} self.log_file = None self.log_level = WARN self.log_categories = [] @@ -70,6 +72,14 @@ excludes = ["*__*__"] config = Config() list_only = opts.list config.broker = URL(opts.broker) +for d in opts.defines: + try: + idx = d.index("=") + name = d[:idx] + value = d[idx+1:] + config.defines[name] = value + except ValueError: + config.defines[d] = None config.log_file = opts.log_file config.log_level = levels[opts.log_level.upper()] config.log_categories = opts.log_categories diff --git a/python/qpid/tests/messaging.py b/python/qpid/tests/messaging.py index fea61f766b..e32b91a26b 100644 --- a/python/qpid/tests/messaging.py +++ b/python/qpid/tests/messaging.py @@ -70,7 +70,8 @@ class Base(Test): return msgs def delay(self): - time.sleep(2) + d = float(self.config.defines.get("delay", "2")) + time.sleep(d) class SetupTests(Base): |