On Sat, Jun 15, 2019 at 13:54:03 +0200, Ján Tomko wrote:
Only strip the carriage return for agent monitor, now that we no longer support text monitor.
Signed-off-by: Ján Tomko <jtomko@redhat.com> --- tests/qemumonitortestutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index cf4fec8873..e2144923f0 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -320,7 +320,7 @@ qemuMonitorTestIO(virNetSocketPtr sock, */ t1 = test->incoming; while ((t2 = strstr(t1, "\n")) || - (!test->json && (t2 = strstr(t1, "\r")))) { + (test->agent && (t2 = strstr(t1, "\r")))) {
The agent monitor is based on JSON though. Could you elaborate why you did this change?