qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject qpid-interop-test git commit: QPIDIT-115: When stderr output from a shim is present, also show stdout output.
Date Thu, 03 May 2018 13:37:07 GMT
Repository: qpid-interop-test
Updated Branches:
  refs/heads/master 050b4f7f7 -> c3b3cff6c


QPIDIT-115: When stderr output from a shim is present, also show stdout output.


Project: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/commit/c3b3cff6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/c3b3cff6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/c3b3cff6

Branch: refs/heads/master
Commit: c3b3cff6cf9a7ed40aebb5b90938835588eb3f24
Parents: 050b4f7
Author: Kim van der Riet <kvdr@localhost.localdomain>
Authored: Thu May 3 09:36:52 2018 -0400
Committer: Kim van der Riet <kvdr@localhost.localdomain>
Committed: Thu May 3 09:36:52 2018 -0400

----------------------------------------------------------------------
 src/python/qpid_interop_test/qit_shim.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/c3b3cff6/src/python/qpid_interop_test/qit_shim.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/qit_shim.py b/src/python/qpid_interop_test/qit_shim.py
index 49cc0e9..fe9aafd 100644
--- a/src/python/qpid_interop_test/qit_shim.py
+++ b/src/python/qpid_interop_test/qit_shim.py
@@ -55,7 +55,7 @@ class ShimProcess(subprocess.Popen):
                 # Workaround for Amqp.NetLite which on some OSs produces a spurious error
message on stderr
                 # which should be ignored:
                 if not stderrdata.startswith('Got a bad hardware address length for an AF_PACKET'):
-                    return stderrdata # ERROR: return stderr string
+                    return 'stderr: %s\nstdout: %s' % (stderrdata, stdoutdata)
             if not stdoutdata: # zero length
                 return None
             type_value_list = stdoutdata.split('\n')[0:-1] # remove trailing '\n', split
by only remaining '\n'


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message