Skip to content

Commit 37a9877

Browse files
committed
Reorder fixture to preserve config db changes (sonic-net#12420)
## Description of PR Summary: Fixes # (issue)27603887 ### Type of change - [x] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] Test case(new/improvement) ## Approach #### What is the motivation for this PR? When ipv6 fixture runs, it overrides changes made by telemetry fixture for setting up testing environment for telemetry. #### How did you do it? Have ipv6 fixture run before telemetry fixture. #### How did you verify/test it? Manual test
1 parent b96d6ae commit 37a9877

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tests/ip/test_mgmt_ipv6_only.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from tests.syslog.test_syslog import run_syslog, check_default_route # noqa F401
1313
from tests.common.fixtures.duthost_utils import convert_and_restore_config_db_to_ipv6_only # noqa F401
1414
from tests.common.helpers.gnmi_utils import GNMIEnvironment
15-
from tests.telemetry.conftest import setup_streaming_telemetry # noqa F401
15+
from tests.telemetry.conftest import gnxi_path, setup_streaming_telemetry # noqa F401
1616

1717
pytestmark = [
1818
pytest.mark.disable_loganalyzer,
@@ -123,9 +123,9 @@ def test_rw_user_ipv6_only(localhost, duthosts, enum_rand_one_per_hwsku_hostname
123123

124124

125125
@pytest.mark.parametrize('setup_streaming_telemetry', [True], indirect=True)
126-
def test_telemetry_output_ipv6_only(duthosts, enum_rand_one_per_hwsku_hostname,
127-
setup_streaming_telemetry, # noqa F811
128-
convert_and_restore_config_db_to_ipv6_only): # noqa F811
126+
def test_telemetry_output_ipv6_only(convert_and_restore_config_db_to_ipv6_only, # noqa F811
127+
duthosts, enum_rand_one_per_hwsku_hostname,
128+
setup_streaming_telemetry): # noqa F811
129129
duthost = duthosts[enum_rand_one_per_hwsku_hostname]
130130
env = GNMIEnvironment(duthost, GNMIEnvironment.TELEMETRY_MODE)
131131
if duthost.is_supervisor_node():

0 commit comments

Comments
 (0)