diff options
| author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2020-06-10 20:05:13 +0100 |
|---|---|---|
| committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2020-06-10 20:05:13 +0100 |
| commit | d71f28ad12ecdbbc05fe95a827bb1d4760c14ab0 (patch) | |
| tree | f065d9999d91e69fdbfed8a9d8ff8624c142b435 /automated/utils | |
| parent | 2f7f380f882f794c91877a3710139f142c142422 (diff) | |
test-runner: change pexpect.spawn to spawnu
After migration to python3 pexpect started failing on remote tests. This
can be fixed by moving to 'spawnu' so all input is considered utf-8
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
Diffstat (limited to 'automated/utils')
| -rwxr-xr-x | automated/utils/test-runner.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/automated/utils/test-runner.py b/automated/utils/test-runner.py index 8fea915..690a8a2 100755 --- a/automated/utils/test-runner.py +++ b/automated/utils/test-runner.py @@ -374,7 +374,7 @@ class AutomatedTestRun(TestRun): def run(self): self.logger.info('Executing %s/run.sh' % self.test['test_path']) shell_cmd = '%s/run.sh 2>&1 | tee %s/stdout.log' % (self.test['test_path'], self.test['test_path']) - self.child = pexpect.spawn('/bin/sh', ['-c', shell_cmd]) + self.child = pexpect.spawnu('/bin/sh', ['-c', shell_cmd]) self.check_result() def check_result(self): @@ -389,10 +389,7 @@ class AutomatedTestRun(TestRun): break try: self.child.expect('\r\n') - if sys.version_info[0] < 3: - print(self.child.before) - else: - print(self.child.before.decode('utf-8')) + print(self.child.before) except pexpect.TIMEOUT: continue except pexpect.EOF: @@ -431,7 +428,7 @@ class RemoteTestRun(AutomatedTestRun): shell_cmd = 'ssh %s %s "%s/run.sh 2>&1"' % (SSH_PARAMS, self.args.target, self.test['target_test_path']) self.logger.debug('shell_cmd: %s' % shell_cmd) output = open("%s/stdout.log" % self.test['test_path'], "w") - self.child = pexpect.spawn(shell_cmd) + self.child = pexpect.spawnu(shell_cmd) self.child.logfile = output self.check_result() |