diff options
Diffstat (limited to 'meta/lib/oeqa/utils')
| -rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/utils/qemutinyrunner.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 4bede3421c..695402fead 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
| @@ -114,7 +114,7 @@ class QemuRunner: | |||
| 114 | try: | 114 | try: |
| 115 | threadsock, threadport = self.create_socket() | 115 | threadsock, threadport = self.create_socket() |
| 116 | self.server_socket, self.serverport = self.create_socket() | 116 | self.server_socket, self.serverport = self.create_socket() |
| 117 | except socket.error, msg: | 117 | except socket.error as msg: |
| 118 | logger.error("Failed to create listening socket: %s" % msg[1]) | 118 | logger.error("Failed to create listening socket: %s" % msg[1]) |
| 119 | return False | 119 | return False |
| 120 | 120 | ||
| @@ -192,7 +192,7 @@ class QemuRunner: | |||
| 192 | else: | 192 | else: |
| 193 | self.ip = ips[0] | 193 | self.ip = ips[0] |
| 194 | self.server_ip = ips[1] | 194 | self.server_ip = ips[1] |
| 195 | except IndexError, ValueError: | 195 | except (IndexError, ValueError): |
| 196 | logger.info("Couldn't get ip from qemu process arguments! Here is the qemu command line used:\n%s\nand output from runqemu:\n%s" % (cmdline, self.getOutput(output))) | 196 | logger.info("Couldn't get ip from qemu process arguments! Here is the qemu command line used:\n%s\nand output from runqemu:\n%s" % (cmdline, self.getOutput(output))) |
| 197 | self._dump_host() | 197 | self._dump_host() |
| 198 | self.stop() | 198 | self.stop() |
diff --git a/meta/lib/oeqa/utils/qemutinyrunner.py b/meta/lib/oeqa/utils/qemutinyrunner.py index e3d8c669e0..d6ce09645c 100644 --- a/meta/lib/oeqa/utils/qemutinyrunner.py +++ b/meta/lib/oeqa/utils/qemutinyrunner.py | |||
| @@ -50,7 +50,7 @@ class QemuTinyRunner(QemuRunner): | |||
| 50 | self.server_socket.connect(self.socketfile) | 50 | self.server_socket.connect(self.socketfile) |
| 51 | bb.note("Created listening socket for qemu serial console.") | 51 | bb.note("Created listening socket for qemu serial console.") |
| 52 | tries = 0 | 52 | tries = 0 |
| 53 | except socket.error, msg: | 53 | except socket.error as msg: |
| 54 | self.server_socket.close() | 54 | self.server_socket.close() |
| 55 | bb.fatal("Failed to create listening socket.") | 55 | bb.fatal("Failed to create listening socket.") |
| 56 | tries -= 1 | 56 | tries -= 1 |
