x
/
tobiko
Code Issues Proposed changes

Unskip UbuntuExternalPortTest tests on upstream jobs 

Decorator skip_unless_osp_version should not skip tests when the osp
version is not known. Those tests were wrongly being skipped in all
upstream jobs

Change-Id: I445fc3a04c70d46fc4fa32aadc88068f9de70533
This commit is contained in:
Eduardo Olivares 2023-04-27 13:11:24 +02:00
parent 556f60bfc2
commit 37ad5aa3b3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tobiko/openstack/topology/_topology.py
View File

@ -725,7 +725,7 @@ def verify_osp_version(required_version, higher=False, lower=False):
except Exception:
current_version = None
if current_version is None:
return False
return True
required_version_parsed = version.parse(required_version)
current_version_parsed = version.parse(current_version)

4
tobiko/tests/scenario/neutron/test_floating_ip.py
View File

@ -28,6 +28,7 @@ from tobiko.shell import sh
from tobiko.openstack import neutron
from tobiko.openstack import stacks
from tobiko.openstack import topology
from tobiko.tripleo import undercloud
CONF = config.CONF
@ -242,6 +243,7 @@ class FloatingIpWithL3HATest(FloatingIPTest):
stack = tobiko.required_fixture(stacks.L3haServerStackFixture)
@undercloud.skip_if_missing_undercloud
@topology.skip_unless_osp_version('16.1', higher=True)
class TestFloatingIPLogging(testtools.TestCase):
@ -251,6 +253,8 @@ class TestFloatingIPLogging(testtools.TestCase):
super(TestFloatingIPLogging, self).setUp()
self.port = neutron.create_port(network_id=self.stack.network_id)
self.fip = neutron.create_floating_ip()
# TODO(eolivare): adapt the following path to non-tripleo setups and
# remove the skip_if_missing_undercloud decorator
log_filename = '/var/log/containers/neutron/server.log'
self.log_digger = files.MultihostLogFileDigger(filename=log_filename,
sudo=True)