From 298e57e4468b67e0cc4409c1cd15547116a7b386 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 24 Sep 2019 20:03:47 +0200 Subject: [PATCH] tests: fix "clients/tests/test-client.py" concatenating binary for Python 3 Python 3 doesn't like this: ====================================================================== ERROR: test_001 (__main__.TestNmcli) ---------------------------------------------------------------------- Traceback (most recent call last): File "./clients/tests/test-client.py", line 785, in f self._nm_test_post() File "./clients/tests/test-client.py", line 767, in _nm_test_post content_new = ''.join([r['content'] for r in results]) TypeError: sequence item 0: expected str instance, bytes found (cherry picked from commit 97646d81ce7af642eb4b1e1095357e0ac4c347f0) (cherry picked from commit ae2d6c0bc927f3327a82e987f9363a2ab72d4381) --- clients/tests/test-client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index fdd21d544d..0ca7300401 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -764,7 +764,7 @@ class TestNmcli(NmTestBase): self.fail("Unexpected output of command, expected %s. Rerun test with NM_TEST_REGENERATE=1 to regenerate files" % (filename)) if regenerate: - content_new = ''.join([r['content'] for r in results]) + content_new = b''.join([r['content'] for r in results]) if content_new != content_expect: try: with open(filename, 'wb') as content_file: