Skip to content
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.

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

tests: create evpn pytest marker and use it #7885

Closed
wants to merge 2 commits into from

Conversation

pjdruddy
Copy link
Contributor

Add evpn marker to all evpn tests to group them

pat@pat-Standard-PC-i440FX-PIIX-1996:~/git/frr/tests/topotests$ sudo pytest -m evpn
mkdir: cannot create directory ‘/tmp/topotests’: File exists
=============================================================================================== test session starts ===============================================================================================
platform linux2 -- Python 2.7.18, pytest-4.6.11, py-1.9.0, pluggy-0.13.1
rootdir: /home/pat/git/frr/tests/topotests, inifile: pytest.ini
collected 740 items / 713 deselected / 27 selected                                                                                                                                                                

bgp-evpn-mh/test_evpn_mh.py .....                                                                                                                                                                           [ 18%]
bgp-evpn-vxlan_topo1/test_bgp_evpn_vxlan.py ........                                                                                                                                                        [ 48%]
bgp_evpn_rt5/test_bgp_evpn.py .                                                                                                                                                                             [ 51%]
evpn-pim-1/test_evpn_pim_topo1.py ..s                                                                                                                                                                       [ 62%]
evpn_type5_test_topo1/test_evpn_type5_topo1.py ..........                                                                                                                                                   [100%]

============================================================================= 26 passed, 1 skipped, 713 deselected in 474.47 seconds =============================================================================```

@polychaeta polychaeta added the tests Topotests, make check, etc label Jan 19, 2021
Copy link

@polychaeta polychaeta left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/d88130d8af7ca96e586a35eb40fb10bf/raw/7eabc4becc2acbbbb59e72abd70376802d054334/cr_7885_1611050670.diff | git apply

diff --git a/tests/topotests/bgp-evpn-mh/test_evpn_mh.py b/tests/topotests/bgp-evpn-mh/test_evpn_mh.py
index 7817b2e77..2f0d54d81 100644
--- a/tests/topotests/bgp-evpn-mh/test_evpn_mh.py
+++ b/tests/topotests/bgp-evpn-mh/test_evpn_mh.py
@@ -362,6 +362,7 @@ def config_hosts(tgen, hosts):
         host = tgen.gears[host_name]
         config_host(host_name, host)
 
+
 @pytest.mark.pim
 def setup_module(module):
     "Setup topology"
diff --git a/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py b/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py
index 494090612..7fe8aca92 100644
--- a/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py
+++ b/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py
@@ -97,6 +97,7 @@ class NetworkTopo(Topo):
 ##
 #####################################################
 
+
 @pytest.mark.pim
 def setup_module(module):
     "Setup topology"

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

Copy link

@polychaeta polychaeta left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/85e343161854a23baab3d8ccf7392ac6/raw/7eabc4becc2acbbbb59e72abd70376802d054334/cr_7885_1611050827.diff | git apply

diff --git a/tests/topotests/bgp-evpn-mh/test_evpn_mh.py b/tests/topotests/bgp-evpn-mh/test_evpn_mh.py
index 7817b2e77..2f0d54d81 100644
--- a/tests/topotests/bgp-evpn-mh/test_evpn_mh.py
+++ b/tests/topotests/bgp-evpn-mh/test_evpn_mh.py
@@ -362,6 +362,7 @@ def config_hosts(tgen, hosts):
         host = tgen.gears[host_name]
         config_host(host_name, host)
 
+
 @pytest.mark.pim
 def setup_module(module):
     "Setup topology"
diff --git a/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py b/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py
index 494090612..7fe8aca92 100644
--- a/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py
+++ b/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py
@@ -97,6 +97,7 @@ class NetworkTopo(Topo):
 ##
 #####################################################
 
+
 @pytest.mark.pim
 def setup_module(module):
     "Setup topology"

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

@LabN-CI
Copy link
Collaborator

LabN-CI commented Jan 19, 2021

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/7885 910041c
Date 01/19/2021
Start 05:05:38
Finish 05:41:06
Run-Time 35:28
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2021-01-19-05:05:38.txt
Log autoscript-2021-01-19-05:06:35.log.bz2
Memory 500 501 420

For details, please contact louberger

@LabN-CI
Copy link
Collaborator

LabN-CI commented Jan 19, 2021

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/7885 4603c04
Date 01/19/2021
Start 06:21:20
Finish 06:56:41
Run-Time 35:21
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2021-01-19-06:21:20.txt
Log autoscript-2021-01-19-06:22:21.log.bz2
Memory 502 500 425

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jan 19, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16584/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16584/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g7d7aad4fc-0 (missing) -> 7.6-dev-20210119-00-g7d7aad4fc-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g7d7aad4fc-0 (missing) -> 7.6-dev-20210119-00-g7d7aad4fc-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g7d7aad4fc-0 (missing) -> 7.6-dev-20210119-00-g7d7aad4fc-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g7d7aad4fc-0 (missing) -> 7.6-dev-20210119-00-g7d7aad4fc-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g7d7aad4fc-0 (missing) -> 7.6-dev-20210119-00-g7d7aad4fc-0~deb10u1

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jan 19, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16582/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16582/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g910041cb3-0 (missing) -> 7.6-dev-20210119-00-g910041cb3-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g910041cb3-0 (missing) -> 7.6-dev-20210119-00-g910041cb3-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g910041cb3-0 (missing) -> 7.6-dev-20210119-00-g910041cb3-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g910041cb3-0 (missing) -> 7.6-dev-20210119-00-g910041cb3-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g910041cb3-0 (missing) -> 7.6-dev-20210119-00-g910041cb3-0~deb10u1

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jan 19, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16586/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16586/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g4603c04f6-0 (missing) -> 7.6-dev-20210119-00-g4603c04f6-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g4603c04f6-0 (missing) -> 7.6-dev-20210119-00-g4603c04f6-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g4603c04f6-0 (missing) -> 7.6-dev-20210119-00-g4603c04f6-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g4603c04f6-0 (missing) -> 7.6-dev-20210119-00-g4603c04f6-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210119-00-g4603c04f6-0 (missing) -> 7.6-dev-20210119-00-g4603c04f6-0~deb10u1

Copy link

@polychaeta polychaeta left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/4b9f4d547cc7815b2bf700f50a020765/raw/eeee227268905db72a5cad644afedce57aad7f81/cr_7885_1611144855.diff | git apply

diff --git a/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py b/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py
index df747a4b5..c15aca32a 100644
--- a/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py
+++ b/tests/topotests/evpn-pim-1/test_evpn_pim_topo1.py
@@ -100,6 +100,7 @@ class NetworkTopo(Topo):
 ##
 #####################################################
 
+
 def setup_module(module):
     "Setup topology"
     tgen = Topogen(NetworkTopo, module.__name__)
@@ -146,6 +147,7 @@ def teardown_module(_mod):
     # This function tears down the whole topology.
     tgen.stop_topology()
 
+
 def test_converge_protocols():
     "Wait for protocol convergence"
 

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

Add evpn marker to all evpn tests to group them

Signed-off-by: Pat Ruddy <pat@voltanet.io>
Document requirement and procedure for marking pytests with protocol
or technology area.

Signed-off-by: Pat Ruddy <pat@voltanet.io>
@LabN-CI
Copy link
Collaborator

LabN-CI commented Jan 20, 2021

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/7885 7e897b5
Date 01/20/2021
Start 07:15:35
Finish 07:54:54
Run-Time 39:19
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2021-01-20-07:15:35.txt
Log autoscript-2021-01-20-07:16:40.log.bz2
Memory 502 507 427

For details, please contact louberger

@LabN-CI
Copy link
Collaborator

LabN-CI commented Jan 20, 2021

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/7885 ffbd4ff
Date 01/20/2021
Start 08:00:36
Finish 08:39:58
Run-Time 39:22
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2021-01-20-08:00:36.txt
Log autoscript-2021-01-20-08:01:39.log.bz2
Memory 506 466 427

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jan 20, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16600/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16600/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210120-01-g7e897b5aa-0 (missing) -> 7.6-dev-20210120-01-g7e897b5aa-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210120-01-g7e897b5aa-0 (missing) -> 7.6-dev-20210120-01-g7e897b5aa-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210120-01-g7e897b5aa-0 (missing) -> 7.6-dev-20210120-01-g7e897b5aa-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210120-01-g7e897b5aa-0 (missing) -> 7.6-dev-20210120-01-g7e897b5aa-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210120-01-g7e897b5aa-0 (missing) -> 7.6-dev-20210120-01-g7e897b5aa-0~deb10u1

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16601/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-16601/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210120-01-gffbd4ff6e-0 (missing) -> 7.6-dev-20210120-01-gffbd4ff6e-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210120-01-gffbd4ff6e-0 (missing) -> 7.6-dev-20210120-01-gffbd4ff6e-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210120-01-gffbd4ff6e-0 (missing) -> 7.6-dev-20210120-01-gffbd4ff6e-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210120-01-gffbd4ff6e-0 (missing) -> 7.6-dev-20210120-01-gffbd4ff6e-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 7.5-0 -> 7.6-dev-20210120-01-gffbd4ff6e-0 (missing) -> 7.6-dev-20210120-01-gffbd4ff6e-0~deb10u1

@pjdruddy
Copy link
Contributor Author

closing - superceded...

@pjdruddy pjdruddy closed this Jan 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do not merge documentation tests Topotests, make check, etc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants