Remove 'component' mark from netcheker/calico tests

The tests for 'mcp-netchecker' and calico are designed
to be executed on CI with custom artifacts set via
parameters. So they can't be run together with rest
component tests without affecting them. That's why
'component' mark was removed.

A separate test/method for network verification after
deployment in BVT is going to be added by another patch.

Also renamed tests method TestFuelCCPNetChecker.test_k8s_netchecker_calico
to TestFuelCCPNetChecker.test_k8s_netchecker, because there
is another test method in another class with the same name:
TestFuelCCPCalico.test_k8s_netchecker_calico.

Closes-bug: #1628512
Change-Id: I5cd7d5f6133a97645676b592fa7628380548e209
This commit is contained in:
Artem Panchenko 2016-09-28 18:01:15 +03:00
parent f5166ebed6
commit f90166f6b7
2 changed files with 2 additions and 4 deletions

View File

@ -25,7 +25,6 @@ LOG = logger.logger
@pytest.mark.usefixtures("check_netchecker_files")
@pytest.mark.usefixtures("check_netchecker_images_settings")
@pytest.mark.usefixtures("check_calico_images_settings")
@pytest.mark.component
class TestFuelCCPCalico(base_test.SystemBaseTest,
test_netchecker.TestFuelCCPNetCheckerMixin):
"""Test class for Calico network plugin in k8s"""

View File

@ -139,7 +139,6 @@ class TestFuelCCPNetCheckerMixin:
@pytest.mark.usefixtures("check_netchecker_files")
@pytest.mark.usefixtures("check_netchecker_images_settings")
@pytest.mark.component
class TestFuelCCPNetChecker(base_test.SystemBaseTest,
TestFuelCCPNetCheckerMixin):
"""Test class for network connectivity verification in k8s"""
@ -147,8 +146,8 @@ class TestFuelCCPNetChecker(base_test.SystemBaseTest,
@pytest.mark.fail_snapshot
@pytest.mark.snapshot_needed
@pytest.mark.revert_snapshot(ext.SNAPSHOT.k8s_deployed)
def test_k8s_netchecker_calico(self, underlay, k8scluster, config,
show_step):
def test_k8s_netchecker(self, underlay, k8scluster, config,
show_step):
"""Test for deploying an k8s environment with Calico and check
connectivity between its networks