diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-04 16:09:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-04 16:09:27 +0000 |
| commit | 7d44796eca10fa61d4d98ab98358c5932746734e (patch) | |
| tree | 1719cd7608f5df72c365b7ff4e163b121cae1c07 | |
| parent | ac24c85b629b04d1bc170c4b32f752763f3b62b8 (diff) | |
| parent | ed947b453f08f59548e1c16d8e853c7dabb66d8a (diff) | |
| download | horizon-7d44796eca10fa61d4d98ab98358c5932746734e.tar.gz | |
Merge "Unskipping test_floatingip_associate_disassociate test case"
| -rw-r--r-- | openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py | 3 | ||||
| -rw-r--r-- | openstack_dashboard/test/integration_tests/tests/test_floatingips.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py b/openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py index 236d9465d..92a292347 100644 --- a/openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py +++ b/openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py @@ -97,6 +97,7 @@ class InstancesPage(basepage.BaseNavigationPage): instance_count=DEFAULT_COUNT, flavor=DEFAULT_FLAVOR, boot_source=DEFAULT_BOOT_SOURCE, + network_type=DEFAULT_NETWORK_TYPE, source_name=None, device_size=None, 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): row = self._get_row_with_instance_name(name) ips = row.cells[self.INSTANCES_TABLE_IP_COLUMN].text - for ip in ips.split(): + for ip in ips.split(','): if netaddr.valid_ipv4(ip): return ip diff --git a/openstack_dashboard/test/integration_tests/tests/test_floatingips.py b/openstack_dashboard/test/integration_tests/tests/test_floatingips.py index ca6aaa5a3..8711cf216 100644 --- a/openstack_dashboard/test/integration_tests/tests/test_floatingips.py +++ b/openstack_dashboard/test/integration_tests/tests/test_floatingips.py @@ -12,7 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -import pytest from openstack_dashboard.test.integration_tests import helpers from openstack_dashboard.test.integration_tests.regions import messages @@ -38,12 +37,11 @@ class TestFloatingip(helpers.TestCase): class TestFloatingipAssociateDisassociate(helpers.TestCase): """Checks that the user is able to Associate/Disassociate floatingip.""" - @pytest.mark.skip(reason="Bug 1920010 fix") def test_floatingip_associate_disassociate(self): instance_name = helpers.gen_random_resource_name('instance', timestamp=False) 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( instances_page.find_messages_and_dismiss(), {messages.INFO}) self.assertTrue(instances_page.is_instance_active(instance_name)) |