The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/pylxd/pull/377

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===
PR#374 introduced a change in behaviour where the stdout/stderr is not
stored if a handler is supplied.  This shouldn't affect most people as,
if you are using a handler, then the code is already doing something
with stdout/stderr.

Signed-off-by: Alex Kavanagh <alex.kavan...@canonical.com>
From 8b5ba453817348c00d9f6809f83b245db0386cea Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex.kavan...@canonical.com>
Date: Thu, 10 Oct 2019 19:25:31 +0100
Subject: [PATCH] Fix the integration test due to PR 374

PR#374 introduced a change in behaviour where the stdout/stderr is not
stored if a handler is supplied.  This shouldn't affect most people as,
if you are using a handler, then the code is already doing something
with stdout/stderr.

Signed-off-by: Alex Kavanagh <alex.kavan...@canonical.com>
---
 integration/test_containers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/integration/test_containers.py b/integration/test_containers.py
index 4bce3c01..e002a6c0 100644
--- a/integration/test_containers.py
+++ b/integration/test_containers.py
@@ -209,7 +209,8 @@ def stdout_handler(msg):
         )
 
         self.assertEqual(0, result.exit_code)
-        self.assertEqual(test_msg, result.stdout)
+        # if a handler is supplied then there is no stdout in result
+        self.assertEqual('', result.stdout)
         self.assertEqual('', result.stderr)
         self.assertEqual(stdout_msgs, [test_msg])
 
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to