summaryrefslogtreecommitdiff
path: root/indra/llmessage/tests/testrunner.py
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-11-17 17:46:50 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-11-17 17:46:50 -0500
commit73a7b14013059eee3b010ae271515d7492654f9b (patch)
tree6c2a89bda8eb9b3f0d8548e32224d297568b12e2 /indra/llmessage/tests/testrunner.py
parentb1185eca82a1c0fff1a885fd5dfea09e5b9c0b3a (diff)
DRTVWR-418: Fold redundant testrunner.py modules together again.
llcorehttp/tests had a clone of llmessage/tests/testrunner.py that was almost identical save for recognizing an extra optional parameter. Migrate those few lines into llmessage/tests/testrunner.py; eliminate the copy in llcorehttp; help test_llcorehttp_peer.py find the testrunner.py in llmessage/tests.
Diffstat (limited to 'indra/llmessage/tests/testrunner.py')
-rwxr-xr-xindra/llmessage/tests/testrunner.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llmessage/tests/testrunner.py b/indra/llmessage/tests/testrunner.py
index 5b9beb359b..9a2de71142 100755
--- a/indra/llmessage/tests/testrunner.py
+++ b/indra/llmessage/tests/testrunner.py
@@ -168,7 +168,10 @@ def run(*args, **kwds):
# executable passed as our first arg,
# - [no e] child should inherit this process's environment.
debug("Running %s...", " ".join(args))
- rc = os.spawnv(os.P_WAIT, args[0], args)
+ if kwds.get("use_path", False):
+ rc = os.spawnvp(os.P_WAIT, args[0], args)
+ else:
+ rc = os.spawnv(os.P_WAIT, args[0], args)
debug("%s returned %s", args[0], rc)
return rc