diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-12-16 14:07:56 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-12-16 14:07:56 +0000 |
| commit | cb88904a54903ef6ba21a68a61d9cd51e2166304 (patch) | |
| tree | cb01e77f4f9c7df0bddeb00d063fd3f500ce775e /tests | |
| parent | 856ffa6465ad38a31603223eb057a253114ceaea (diff) | |
| parent | 5d480ddde36649a652152bf35f57ccad38f052d6 (diff) | |
Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-dec-16-2019' into staging
MIPS queue for December 16th, 2019
# gpg: Signature made Mon 16 Dec 2019 12:29:24 GMT
# gpg: using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [full]
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01 DD75 D497 2A89 67F7 5A65
* remotes/amarkovic/tags/mips-queue-dec-16-2019:
MAINTAINERS: Add a file to MIPS section
MAINTAINERS: Add three files to Malta section
MAINTAINERS: Adjust maintainership for Malta board
MAINTAINERS: Adjust maintainership for Fulong 2E board
MAINTAINERS: Add a section on UI translation
hw/mips: Deprecate the r4k machine
mips: fulong 2e: Renovate coding style
mips: r4000: Renovate coding style
mips: mipssim: Renovate coding style
mips: malta: Renovate coding style
mips: jazz: Renovate coding style
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/acceptance/linux_ssh_mips_malta.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py index fc13f9e4d4..4db18de800 100644 --- a/tests/acceptance/linux_ssh_mips_malta.py +++ b/tests/acceptance/linux_ssh_mips_malta.py @@ -99,10 +99,12 @@ class LinuxSSH(Test): def ssh_command(self, command, is_root=True): self.ssh_logger.info(command) result = self.ssh_session.cmd(command) - stdout_lines = [line.rstrip() for line in result.stdout_text.splitlines()] + stdout_lines = [line.rstrip() for line + in result.stdout_text.splitlines()] for line in stdout_lines: self.ssh_logger.info(line) - stderr_lines = [line.rstrip() for line in result.stderr_text.splitlines()] + stderr_lines = [line.rstrip() for line + in result.stderr_text.splitlines()] for line in stderr_lines: self.ssh_logger.warning(line) return stdout_lines, stderr_lines |