[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/18] tests/acceptance/virtiofs_submounts: standardize port as in
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 15/18] tests/acceptance/virtiofs_submounts: standardize port as integer |
Date: |
Mon, 8 Feb 2021 14:37:08 +0100 |
From: Cleber Rosa <crosa@redhat.com>
Instead of having to cast it whenever it's going to be used, let's
standardize it as an integer, which is the data type that will be
used most often.
Given that the regex will only match digits, it's safe that we'll
end up getting a integer, but, it could as well be a zero.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
Message-Id: <20210203172357.1422425-9-crosa@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/acceptance/virtiofs_submounts.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/acceptance/virtiofs_submounts.py
b/tests/acceptance/virtiofs_submounts.py
index f1b49f03bb5..82941756086 100644
--- a/tests/acceptance/virtiofs_submounts.py
+++ b/tests/acceptance/virtiofs_submounts.py
@@ -86,17 +86,18 @@ def get_portfwd(self):
re.search(r'TCP.HOST_FORWARD.*127\.0\.0\.1\s*(\d+)\s+10\.',
line)
if match is not None:
- port = match[1]
+ port = int(match[1])
break
self.assertIsNotNone(port)
- self.log.debug('sshd listening on port: ' + port)
+ self.assertGreater(port, 0)
+ self.log.debug('sshd listening on port: %d', port)
return port
def ssh_connect(self, username, keyfile):
self.ssh_logger = logging.getLogger('ssh')
port = self.get_portfwd()
- self.ssh_session = ssh.Session('127.0.0.1', port=int(port),
+ self.ssh_session = ssh.Session('127.0.0.1', port=port,
user=username, key=keyfile)
for i in range(10):
try:
--
2.26.2
- [PULL 00/18] Integration testing patches for 2021-02-08, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 02/18] tests/acceptance: Introduce tesseract_ocr() helper, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 01/18] tests/acceptance: Extract tesseract_available() helper in new namespace, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 03/18] tests/acceptance: Extract do_test_arm_orangepi_armbian_uboot() method, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 07/18] tests/acceptance: Add a test for the virtex-ml507 ppc machine, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 05/18] tests/acceptance: Move the pseries test to a separate file, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 06/18] tests/acceptance: Test the mpc8544ds machine, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 11/18] tests/acceptance/boot_linux: rename misleading cloudinit method, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 12/18] tests/acceptance/virtiofs_submounts: use workdir property, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 14/18] tests/acceptance/virtiofs_submounts: use a virtio-net device instead, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 15/18] tests/acceptance/virtiofs_submounts: standardize port as integer,
Philippe Mathieu-Daudé <=
- [PULL 04/18] tests/acceptance: Test U-Boot/Linux from Armbian 20.08 on Orange Pi PC, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 09/18] tests/acceptance: Re-enable the microblaze test, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 13/18] tests/acceptance/virtiofs_submounts: do not ask for ssh key password, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 16/18] tests/acceptance/virtiofs_submounts: required space between IP and port, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 10/18] tests/acceptance/boot_linux: fix typo on cloudinit error message, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 18/18] Acceptance Tests: remove unnecessary tag from documentation example, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 08/18] tests/acceptance: Increase the timeout in the replay tests, Philippe Mathieu-Daudé, 2021/02/08
- [PULL 17/18] Acceptance tests: clarify ssh connection failure reason, Philippe Mathieu-Daudé, 2021/02/08
- Re: [PULL 00/18] Integration testing patches for 2021-02-08, Peter Maydell, 2021/02/08