summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnastasiya <atolochkova@mirantis.com>2016-08-29 14:08:34 +0300
committerAnastasia Balobashina <atolochkova@mirantis.com>2016-09-13 06:32:16 +0000
commit6e7303d27650513bffd72afd95e055b7c20bc0e2 (patch)
tree14258d8e8b2be51894cd7c028acdba9957fcb1d0
parente38d48cbc5d216ac0f853466ab48e5d6d9687521 (diff)
Skip test regarding vips
due to changes functions get_assigned_vips and assign_given_vips_for_net_groups in nailgun.network.manager in the next commit (I2638279371e91f15090c782fc5fdbb434a2e85f8) Change-Id: I93e43be60dacc9ba5546cb50ba04a98bd35d276c (cherry picked from commit 2d12209aaab6959e0572873f1dd357a08d140634)
Notes
Notes (review): Code-Review+2: Ilya Kharin <akscram@gmail.com> Code-Review+2: Sergey Abramov <sabramov@mirantis.com> Workflow+1: Ilya Kharin <akscram@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 13 Sep 2016 14:18:25 +0000 Reviewed-on: https://review.openstack.org/362067 Project: openstack/fuel-nailgun-extension-cluster-upgrade Branch: refs/heads/master
-rw-r--r--cluster_upgrade/tests/test_handlers.py2
-rw-r--r--cluster_upgrade/tests/test_transformations.py3
-rw-r--r--cluster_upgrade/tests/test_upgrade.py3
3 files changed, 7 insertions, 1 deletions
diff --git a/cluster_upgrade/tests/test_handlers.py b/cluster_upgrade/tests/test_handlers.py
index f3f5d1d..71c5f05 100644
--- a/cluster_upgrade/tests/test_handlers.py
+++ b/cluster_upgrade/tests/test_handlers.py
@@ -13,6 +13,7 @@
13# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 13# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14# License for the specific language governing permissions and limitations 14# License for the specific language governing permissions and limitations
15# under the License. 15# under the License.
16import unittest
16 17
17import mock 18import mock
18 19
@@ -226,6 +227,7 @@ class TestNodeReassignHandler(base.BaseIntegrationTest):
226 227
227 228
228class TestCopyVipsHandler(tests_base.BaseCloneClusterTest): 229class TestCopyVipsHandler(tests_base.BaseCloneClusterTest):
230 @unittest.skip("Skip test regarding vips")
229 def test_copy_vips(self): 231 def test_copy_vips(self):
230 node_db = self.env.create_node(cluster_id=self.src_cluster.id, 232 node_db = self.env.create_node(cluster_id=self.src_cluster.id,
231 roles=["controller"]) 233 roles=["controller"])
diff --git a/cluster_upgrade/tests/test_transformations.py b/cluster_upgrade/tests/test_transformations.py
index 7186e1b..19069a1 100644
--- a/cluster_upgrade/tests/test_transformations.py
+++ b/cluster_upgrade/tests/test_transformations.py
@@ -9,8 +9,8 @@
9# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 9# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
10# License for the specific language governing permissions and limitations 10# License for the specific language governing permissions and limitations
11# under the License. 11# under the License.
12
13from distutils import version 12from distutils import version
13import unittest
14 14
15import mock 15import mock
16from nailgun.test import base as nailgun_test_base 16from nailgun.test import base as nailgun_test_base
@@ -239,6 +239,7 @@ class TestVipTransformers(nailgun_test_base.BaseUnitTest):
239 } 239 }
240 } 240 }
241 241
242 @unittest.skip("Skip test regarding vips")
242 def test_vip_transform(self): 243 def test_vip_transform(self):
243 ip = '0.0.0.0' 244 ip = '0.0.0.0'
244 245
diff --git a/cluster_upgrade/tests/test_upgrade.py b/cluster_upgrade/tests/test_upgrade.py
index 15bb61c..56a8af8 100644
--- a/cluster_upgrade/tests/test_upgrade.py
+++ b/cluster_upgrade/tests/test_upgrade.py
@@ -15,6 +15,8 @@
15# under the License. 15# under the License.
16 16
17import copy 17import copy
18import unittest
19
18import six 20import six
19 21
20from nailgun import consts 22from nailgun import consts
@@ -144,6 +146,7 @@ class TestUpgradeHelperCloneCluster(base_tests.BaseCloneClusterTest):
144 self.assertEqual(public_net['ip_ranges'], 146 self.assertEqual(public_net['ip_ranges'],
145 self.public_net_data['ip_ranges']) 147 self.public_net_data['ip_ranges'])
146 148
149 @unittest.skip("Skip test regarding vips")
147 def test_copy_vips(self): 150 def test_copy_vips(self):
148 # save network information before node reassignment to seed cluster 151 # save network information before node reassignment to seed cluster
149 # as after that no VIP will be allocated/serialized due to 152 # as after that no VIP will be allocated/serialized due to