summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshish Gupta <ashigupt@redhat.com>2023-04-03 17:56:14 +0530
committerAshish Gupta <ashigupt@redhat.com>2023-05-09 17:14:02 +0530
commita72e5440a7c6c5df1d1bd61367056913fa532628 (patch)
treee11ad27d600e67290a5d46b1106a09e94d240e46
parent987c876de4c4ee776aa58afbd495cf806309782c (diff)
downloadhorizon-a72e5440a7c6c5df1d1bd61367056913fa532628.tar.gz
Unskipping test_floatingip_associate_disassociate test case
Change-Id: I31d73269364fc3a4fa26bf8759852f84ca9b25e0 (cherry picked from commit ed947b453f08f59548e1c16d8e853c7dabb66d8a)
-rw-r--r--openstack_dashboard/test/integration_tests/pages/project/compute/instancespage.py3
-rw-r--r--openstack_dashboard/test/integration_tests/tests/test_floatingips.py4
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 29b57843d..abbc388df 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
@@ -42,12 +41,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.assertTrue(
instances_page.find_message_and_dismiss(messages.INFO))
self.assertFalse(