Skip to content

[pytest] Relocate Session Level Fixtures To Test Files #1795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tahmed-dev merged 1 commit into from
Jun 23, 2020
Merged

[pytest] Relocate Session Level Fixtures To Test Files #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tests/common/fixtures/advanced_reboot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import pytest
import time

from common.fixtures.ptfhost_utils import copy_ptftests_directory # lgtm[py/unused-import]
from common.fixtures.ptfhost_utils import change_mac_addresses # lgtm[py/unused-import]
from common.mellanox_data import is_mellanox_device as isMellanoxDevice
from common.platform.ssh_utils import prepare_testbed_ssh_keys as prepareTestbedSshKeys
from common.reboot import reboot as rebootDut
Expand Down
1 change: 0 additions & 1 deletion tests/common/fixtures/populate_fdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import logging
import pytest

from common.fixtures.ptfhost_utils import copy_ptftests_directory # lgtm[py/unused-import]
from ptf_runner import ptf_runner

logger = logging.getLogger(__name__)
Expand Down
3 changes: 0 additions & 3 deletions tests/copp/copp_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
Refactor ptfadapter so it can be leveraged in these test cases.
"""

from common.fixtures.ptfhost_utils import copy_ptftests_directory # lgtm[py/unused-import]
from common.fixtures.ptfhost_utils import change_mac_addresses # lgtm[py/unused-import]

DEFAULT_NN_TARGET_PORT = 3

_REMOVE_IP_SCRIPT = "scripts/remove_ip.sh"
Expand Down
4 changes: 3 additions & 1 deletion tests/copp/test_copp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@
"""

import time
import pytest
from collections import namedtuple

import pytest
from common.fixtures.ptfhost_utils import copy_ptftests_directory # lgtm[py/unused-import]
from common.fixtures.ptfhost_utils import change_mac_addresses # lgtm[py/unused-import]
from copp import copp_utils
from ptf_runner import ptf_runner
from common.system_utils import docker
Expand Down
3 changes: 3 additions & 0 deletions tests/platform_tests/test_advanced_reboot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import pytest

from common.fixtures.ptfhost_utils import copy_ptftests_directory # lgtm[py/unused-import]
from common.fixtures.ptfhost_utils import change_mac_addresses # lgtm[py/unused-import]

@pytest.mark.usefixtures('get_advanced_reboot')
def test_fast_reboot(request, get_advanced_reboot):
'''
Expand Down
3 changes: 0 additions & 3 deletions tests/qos/qos_sai_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
import re
import yaml

from common.fixtures.ptfhost_utils import copy_ptftests_directory # lgtm[py/unused-import]
from common.fixtures.ptfhost_utils import copy_acstests_directory # lgtm[py/unused-import]
from common.fixtures.ptfhost_utils import change_mac_addresses # lgtm[py/unused-import]
from common.mellanox_data import is_mellanox_device as isMellanoxDevice
from common.system_utils import docker

Expand Down
3 changes: 3 additions & 0 deletions tests/qos/test_qos_sai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
import logging
import pytest

from common.fixtures.ptfhost_utils import copy_ptftests_directory # lgtm[py/unused-import]
from common.fixtures.ptfhost_utils import copy_saitests_directory # lgtm[py/unused-import]
from common.fixtures.ptfhost_utils import change_mac_addresses # lgtm[py/unused-import]
from qos_sai_base import QosSaiBase

logger = logging.getLogger(__name__)
Expand Down
2 changes: 2 additions & 0 deletions tests/testbed_setup/test_populate_fdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import pytest

from common.fixtures.ptfhost_utils import copy_ptftests_directory # lgtm[py/unused-import]

def test_populate_fdb(populate_fdb):
"""
Populates DUT FDB entries
Expand Down