Merge "Unskipping test_floatingip_associate_disassociate test case"

This commit is contained in:
Zuul 2023-04-04 16:09:27 +00:00 committed by Gerrit Code Review
commit 7d44796eca
2 changed files with 3 additions and 4 deletions

View File

@ -97,6 +97,7 @@ class InstancesPage(basepage.BaseNavigationPage):
instance_count=DEFAULT_COUNT, instance_count=DEFAULT_COUNT,
flavor=DEFAULT_FLAVOR, flavor=DEFAULT_FLAVOR,
boot_source=DEFAULT_BOOT_SOURCE, boot_source=DEFAULT_BOOT_SOURCE,
network_type=DEFAULT_NETWORK_TYPE,
source_name=None, source_name=None,
device_size=None, device_size=None,
vol_delete_on_instance_delete=DEFAULT_VOL_DELETE_ON_INSTANCE_DELETE vol_delete_on_instance_delete=DEFAULT_VOL_DELETE_ON_INSTANCE_DELETE
@ -187,6 +188,6 @@ class InstancesPage(basepage.BaseNavigationPage):
def get_fixed_ipv4(self, name): def get_fixed_ipv4(self, name):
row = self._get_row_with_instance_name(name) row = self._get_row_with_instance_name(name)
ips = row.cells[self.INSTANCES_TABLE_IP_COLUMN].text ips = row.cells[self.INSTANCES_TABLE_IP_COLUMN].text
for ip in ips.split(): for ip in ips.split(','):
if netaddr.valid_ipv4(ip): if netaddr.valid_ipv4(ip):
return ip return ip

View File

@ -12,7 +12,6 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import pytest
from openstack_dashboard.test.integration_tests import helpers from openstack_dashboard.test.integration_tests import helpers
from openstack_dashboard.test.integration_tests.regions import messages from openstack_dashboard.test.integration_tests.regions import messages
@ -38,12 +37,11 @@ class TestFloatingip(helpers.TestCase):
class TestFloatingipAssociateDisassociate(helpers.TestCase): class TestFloatingipAssociateDisassociate(helpers.TestCase):
"""Checks that the user is able to Associate/Disassociate floatingip.""" """Checks that the user is able to Associate/Disassociate floatingip."""
@pytest.mark.skip(reason="Bug 1920010 fix")
def test_floatingip_associate_disassociate(self): def test_floatingip_associate_disassociate(self):
instance_name = helpers.gen_random_resource_name('instance', instance_name = helpers.gen_random_resource_name('instance',
timestamp=False) timestamp=False)
instances_page = self.home_pg.go_to_project_compute_instancespage() instances_page = self.home_pg.go_to_project_compute_instancespage()
instances_page.create_instance(instance_name) instances_page.create_instance(instance_name, network_type='internal')
self.assertEqual( self.assertEqual(
instances_page.find_messages_and_dismiss(), {messages.INFO}) instances_page.find_messages_and_dismiss(), {messages.INFO})
self.assertTrue(instances_page.is_instance_active(instance_name)) self.assertTrue(instances_page.is_instance_active(instance_name))