Skip to content

Add topology-marker override logic #1801

Merged
bingwang-ms merged 1 commit intosonic-net:masterfrom
bingwang-ms:enhance_topology_marker
Jun 24, 2020
Merged

Add topology-marker override logic #1801
bingwang-ms merged 1 commit intosonic-net:masterfrom
bingwang-ms:enhance_topology_marker

Conversation

@bingwang-ms
Copy link
Copy Markdown
Collaborator

@bingwang-ms bingwang-ms commented Jun 22, 2020

Description of PR

Summary:
Fixes # (issue)
Add marker override logic in test framework.

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Approach

What is the motivation for this PR?

We need to find a easier way to organize testcases according to topologies.

How did you do it?

Update check_topology in tests/common/plugins/custom_markers/_ init _.py.
Basicly, topology marker is given to a module, but the higher level topology marker is overrided when a lower topology marker is given. For example, the testcase level marker overrides the marker on module level.

How did you verify/test it?

Run testcases with different topo markers.

Any platform specific information?

No.

Supported testbed topology if it's a new test case?

No.

Documentation

https://github.com/Azure/sonic-mgmt/blob/master/tests/docs/pytest.org.md (updated in this pr)

@bingwang-ms bingwang-ms requested review from lolyu and neethajohn June 22, 2020 07:08
@neethajohn neethajohn requested a review from a team June 22, 2020 17:29
@neethajohn
Copy link
Copy Markdown
Contributor

Can you also update this doc to specify the marker override behavior in the test categorization section?
https://github.com/Azure/sonic-mgmt/blob/master/tests/docs/pytest.org.md

@bingwang-ms bingwang-ms force-pushed the enhance_topology_marker branch 4 times, most recently from 1c334c5 to ea9175a Compare June 23, 2020 03:38
@bingwang-ms
Copy link
Copy Markdown
Collaborator Author

Can you also update this doc to specify the marker override behavior in the test categorization section?
https://github.com/Azure/sonic-mgmt/blob/master/tests/docs/pytest.org.md

Done.

@bingwang-ms bingwang-ms changed the title Add topology-marker "any" and topology-marker override Add topology-marker override logic Jun 23, 2020
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

specify dummy names for inventory, hostname, tb, tb_file

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Thanks!

@bingwang-ms bingwang-ms force-pushed the enhance_topology_marker branch from ea9175a to f7c3b04 Compare June 24, 2020 01:17
@bingwang-ms bingwang-ms merged commit 3488765 into sonic-net:master Jun 24, 2020
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
25f7c79 [sonic-package-manager] remove make_python_identifier (sonic-net#1801)
84a7602 [sonic-package-manager] stop service explicitelly before uninstalling package (sonic-net#1805)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants