| Message ID | 20210203172357.1422425-9-crosa@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Acceptance Test: introduce base class for Linux based tests | expand |
On Wed, Feb 03, 2021 at 12:23:43PM -0500, Cleber Rosa wrote: > 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> > --- > 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 f25a386a19..227a3cf1ee 100644 > --- a/tests/acceptance/virtiofs_submounts.py > +++ b/tests/acceptance/virtiofs_submounts.py > @@ -86,17 +86,18 @@ class VirtiofsSubmountsTest(BootLinux): > 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.25.4 > Reviewed-by: Beraldo Leal <bleal@redhat.com>
diff --git a/tests/acceptance/virtiofs_submounts.py b/tests/acceptance/virtiofs_submounts.py index f25a386a19..227a3cf1ee 100644 --- a/tests/acceptance/virtiofs_submounts.py +++ b/tests/acceptance/virtiofs_submounts.py @@ -86,17 +86,18 @@ class VirtiofsSubmountsTest(BootLinux): 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:
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> --- tests/acceptance/virtiofs_submounts.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)