From 242b63be234f6d98a57166b25f8b5728430ddb80 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 3 Aug 2017 12:52:32 -0700 Subject: [PATCH] Don't check full subnet body in test_filtering_shared_subnets Plugins may add attributes to subnets, in which case simple equality check will fail. Instead of comparing bodies, compare just IDs. It should be enough to achieve the goal of the test case. Change-Id: Iebc22f99285777df7de499c713b2bc1e38e0bd62 Closes-Bug: #1706986 --- .../admin/test_shared_network_extension.py | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/neutron/tests/tempest/api/admin/test_shared_network_extension.py b/neutron/tests/tempest/api/admin/test_shared_network_extension.py index fc2e55cae28..2be0ea27342 100644 --- a/neutron/tests/tempest/api/admin/test_shared_network_extension.py +++ b/neutron/tests/tempest/api/admin/test_shared_network_extension.py @@ -65,19 +65,22 @@ class SharedNetworksTest(base.BaseAdminNetworkTest): client=self.admin_client) self.assertIn(shared['id'], self._list_subnets_ids(self.client, shared=True)) - self.assertIn(shared, - self.admin_client.list_subnets(shared=True)['subnets']) - self.assertNotIn(priv, - self.client.list_subnets(shared=True)['subnets']) - self.assertNotIn(priv, - self.admin_client.list_subnets(shared=True)['subnets']) - self.assertIn(priv, self.client.list_subnets(shared=False)['subnets']) + self.assertIn(shared['id'], + self._list_subnets_ids(self.admin_client, shared=True)) + self.assertNotIn(priv['id'], + self._list_subnets_ids(self.client, shared=True)) + self.assertNotIn( + priv['id'], + self._list_subnets_ids(self.admin_client, shared=True)) + self.assertIn(priv['id'], + self._list_subnets_ids(self.client, shared=False)) self.assertIn(priv['id'], self._list_subnets_ids(self.admin_client, shared=False)) - self.assertNotIn(shared, - self.client.list_subnets(shared=False)['subnets']) - self.assertNotIn(shared, - self.admin_client.list_subnets(shared=False)['subnets']) + self.assertNotIn(shared['id'], + self._list_subnets_ids(self.client, shared=False)) + self.assertNotIn( + shared['id'], + self._list_subnets_ids(self.admin_client, shared=False)) @decorators.idempotent_id('6661d219-b96d-4597-ad10-55766ce4abf7') def test_create_update_shared_network(self):