You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cl...@apache.org on 2016/05/25 01:07:33 UTC
qpid-proton git commit: PROTON-1213: Fix quick_perf_xx targets.
Repository: qpid-proton
Updated Branches:
refs/heads/master ebc78988a -> 5a1a32cbc
PROTON-1213: Fix quick_perf_xx targets.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/5a1a32cb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/5a1a32cb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/5a1a32cb
Branch: refs/heads/master
Commit: 5a1a32cbc4657125c352c6e6d24e5edfec8b4737
Parents: ebc7898
Author: Clifford Jansen <cl...@apache.org>
Authored: Tue May 24 18:04:27 2016 -0700
Committer: Clifford Jansen <cl...@apache.org>
Committed: Tue May 24 18:04:27 2016 -0700
----------------------------------------------------------------------
tests/perf/quick_perf.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/5a1a32cb/tests/perf/quick_perf.py
----------------------------------------------------------------------
diff --git a/tests/perf/quick_perf.py b/tests/perf/quick_perf.py
index bb7f599..59b47a2 100644
--- a/tests/perf/quick_perf.py
+++ b/tests/perf/quick_perf.py
@@ -25,7 +25,7 @@
import os, sys, socket, time
-from example_test import background, verify, wait_addr, execute, pick_addr, cmdline
+from example_test import Proc, pick_addr
from subprocess import Popen, PIPE, STDOUT
@@ -61,16 +61,16 @@ except:
# Use Proton-C reactor-recv as a relatively fast loopback "broker" for these tests
-server = cmdline("reactor-recv", "-a", linkaddr, "-c", str(mcount), "-R")
+server = Proc(["reactor-recv", "-X", "listening", "-a", linkaddr, "-c", str(mcount), "-R"], ready="listening",
+ skip_valgrind=True, timeout=300)
try:
- recv = Popen(server, stdout=NULL, stderr=sys.stderr)
- wait_addr(connaddr)
start = time.time()
- execute(*perf_target)
+ client = Proc(perf_target, skip_valgrind=True, timeout=300)
+ print client.wait_exit()
+ server.wait_exit()
end = time.time()
- verify(recv)
except Exception as e:
- if recv: recv.kill()
+ if server: server.safe_kill()
raise Exception("Error running %s: %s", server, e)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org