From 172defa0d4cdc64c1fd4cf1f904a03e4370dca00 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Thu, 5 Jul 2018 14:55:21 -0400
Subject: [PATCH] don't use codecs.open for syncing isolated stdout data

see: https://github.com/ansible/tower/issues/2315
---
 awx/main/expect/isolated_manager.py       |  2 +-
 awx/main/tests/unit/expect/test_expect.py | 42 +++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/awx/main/expect/isolated_manager.py b/awx/main/expect/isolated_manager.py
index a723d13fa2..7cbe8bbbc0 100644
--- a/awx/main/expect/isolated_manager.py
+++ b/awx/main/expect/isolated_manager.py
@@ -318,7 +318,7 @@ class IsolatedManager(object):
 
             path = self.path_to('artifacts', 'stdout')
             if os.path.exists(path):
-                with codecs.open(path, 'r', encoding='utf-8') as f:
+                with open(path, 'r') as f:
                     f.seek(seek)
                     for line in f:
                         self.stdout_handle.write(line)
diff --git a/awx/main/tests/unit/expect/test_expect.py b/awx/main/tests/unit/expect/test_expect.py
index 782a65997d..5f7a76b139 100644
--- a/awx/main/tests/unit/expect/test_expect.py
+++ b/awx/main/tests/unit/expect/test_expect.py
@@ -318,6 +318,48 @@ def test_check_isolated_job(private_data_dir, rsa_key):
         )
 
 
+def test_check_isolated_job_with_multibyte_unicode(private_data_dir):
+    """
+    Ensure that multibyte unicode is properly synced when stdout only
+    contains the first part of the multibyte character
+
+    see: https://github.com/ansible/tower/issues/2315
+    """
+    def raw_output():
+        yield ('failed', '\xe8\xb5\xb7\xe5')  # 起 <partial byte>
+        yield ('successful', '\xe8\xb5\xb7\xe5\x8b\x95')  # 起動
+    raw_output = raw_output()
+    stdout = StringIO.StringIO()
+    mgr = isolated_manager.IsolatedManager(['ls', '-la'], HERE, {}, stdout, '')
+    mgr.private_data_dir = private_data_dir
+    mgr.instance = mock.Mock(id=123, pk=123, verbosity=5, spec_set=['id', 'pk', 'verbosity'])
+    mgr.started_at = time.time()
+    mgr.host = 'isolated-host'
+
+    os.mkdir(os.path.join(private_data_dir, 'artifacts'))
+    with mock.patch('awx.main.expect.run.run_pexpect') as run_pexpect:
+
+        def _synchronize_job_artifacts(args, cwd, env, buff, **kw):
+            buff.write('checking job status...')
+            status, out = next(raw_output)
+            for filename, data in (
+                ['status', status],
+                ['rc', '0'],
+                ['stdout', out]
+            ):
+                with open(os.path.join(private_data_dir, 'artifacts', filename), 'w') as f:
+                    f.write(data)
+                    f.flush()
+            return (status, 0)
+
+        run_pexpect.side_effect = _synchronize_job_artifacts
+        with mock.patch.object(mgr, '_missing_artifacts') as missing_artifacts:
+            missing_artifacts.return_value = False
+            status, rc = mgr.check(interval=0)
+
+        assert stdout.getvalue() == '起動'
+
+
 def test_check_isolated_job_timeout(private_data_dir, rsa_key):
     pem, passphrase = rsa_key
     stdout = StringIO.StringIO()