From 4c58f1cfbb0d1c9a8145a5cdcdcfd513ec41132f Mon Sep 17 00:00:00 2001 From: Xin Wang Date: Thu, 9 Apr 2020 01:36:44 +0800 Subject: [PATCH] Update the importing of conn_graph_facts after platform_fixtures.py is removed (#1547) PR #1492 copied the implementation of conn_graph_facts in tests/platform/platform_fixtures.py to tests/common/fixtures/conn_graph_facts.py. Then PR #1503 removed file tests/platform/platform_fixtures.py. But not all related importings were updated. This change is to update all the platform_fixtures related importings. Signed-off-by: Xin Wang Co-authored-by: Xin Wang --- tests/platform/mellanox/test_check_sfp_presence.py | 2 +- tests/platform/mellanox/test_check_sfp_using_ethtool.py | 2 +- tests/platform/test_reload_config.py | 2 +- tests/platform/test_sequential_restart.py | 2 +- tests/platform/test_sfp.py | 2 +- tests/platform/test_xcvr_info_in_db.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/platform/mellanox/test_check_sfp_presence.py b/tests/platform/mellanox/test_check_sfp_presence.py index d0dd52862b..93e8121ec1 100644 --- a/tests/platform/mellanox/test_check_sfp_presence.py +++ b/tests/platform/mellanox/test_check_sfp_presence.py @@ -5,7 +5,7 @@ import os import json -from platform_fixtures import conn_graph_facts +from common.fixtures.conn_graph_facts import conn_graph_facts def test_check_sfp_presence(testbed_devices, conn_graph_facts): """This test case is to check SFP presence status with CLI and sysfs. diff --git a/tests/platform/mellanox/test_check_sfp_using_ethtool.py b/tests/platform/mellanox/test_check_sfp_using_ethtool.py index 5f1e1dc268..e4f7a600aa 100644 --- a/tests/platform/mellanox/test_check_sfp_using_ethtool.py +++ b/tests/platform/mellanox/test_check_sfp_using_ethtool.py @@ -8,7 +8,7 @@ import os import json -from platform_fixtures import conn_graph_facts +from common.fixtures.conn_graph_facts import conn_graph_facts from check_hw_mgmt_service import check_hw_management_service diff --git a/tests/platform/test_reload_config.py b/tests/platform/test_reload_config.py index 1cf025b46e..2787cf3790 100644 --- a/tests/platform/test_reload_config.py +++ b/tests/platform/test_reload_config.py @@ -10,7 +10,7 @@ import pytest -from platform_fixtures import conn_graph_facts +from common.fixtures.conn_graph_facts import conn_graph_facts from common.utilities import wait_until from check_critical_services import check_critical_services from check_transceiver_status import check_transceiver_basic diff --git a/tests/platform/test_sequential_restart.py b/tests/platform/test_sequential_restart.py index bcab5c8152..7de1782283 100644 --- a/tests/platform/test_sequential_restart.py +++ b/tests/platform/test_sequential_restart.py @@ -10,7 +10,7 @@ import pytest -from platform_fixtures import conn_graph_facts +from common.fixtures.conn_graph_facts import conn_graph_facts from common.utilities import wait_until from check_critical_services import check_critical_services from check_transceiver_status import check_transceiver_basic diff --git a/tests/platform/test_sfp.py b/tests/platform/test_sfp.py index bd6dcf2e85..510afaf5f0 100644 --- a/tests/platform/test_sfp.py +++ b/tests/platform/test_sfp.py @@ -13,7 +13,7 @@ import pytest -from platform_fixtures import conn_graph_facts +from common.fixtures.conn_graph_facts import conn_graph_facts from common.plugins.loganalyzer.loganalyzer import LogAnalyzer ans_host = None diff --git a/tests/platform/test_xcvr_info_in_db.py b/tests/platform/test_xcvr_info_in_db.py index 264a0e7885..087a27e139 100644 --- a/tests/platform/test_xcvr_info_in_db.py +++ b/tests/platform/test_xcvr_info_in_db.py @@ -9,7 +9,7 @@ import os from check_transceiver_status import check_transceiver_status -from platform_fixtures import conn_graph_facts +from common.fixtures.conn_graph_facts import conn_graph_facts def test_xcvr_info_in_db(testbed_devices, conn_graph_facts):