]> git.puffer.fish Git - mirror/frr.git/commitdiff
template: allow test to be run without pytest
authorRafael Zalamena <rzalamena@gmail.com>
Thu, 29 Jun 2017 13:46:19 +0000 (10:46 -0300)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Wed, 28 Nov 2018 01:22:11 +0000 (20:22 -0500)
Update the PYTHONPATH for standalone runs and pass all command line
arguments to pytest main. Also set the executable bit to the python
scripts file.

tests/topotests/example-test/__init__.py [changed mode: 0644->0755]
tests/topotests/example-test/test_template.py [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
index ac6faea..b755645
@@ -30,6 +30,11 @@ import os
 import sys
 import pytest
 
+# Save the Current Working Directory to find configuration files.
+CWD = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(os.path.join(CWD, '../'))
+
+# pylint: disable=C0413
 # Import topogen and topotest helpers
 from lib import topotest
 from lib.topogen import Topogen, TopoRouter, get_topogen
@@ -37,9 +42,6 @@ from lib.topogen import Topogen, TopoRouter, get_topogen
 # Required to instantiate the topology builder class.
 from mininet.topo import Topo
 
-# Save the Current Working Directory to find configuration files.
-CWD = os.path.dirname(os.path.realpath(__file__))
-
 class TemplateTopo(Topo):
     "Test topology builder"
     def build(self, *_args, **_opts):
@@ -99,4 +101,5 @@ def test_call_mininet_cli():
     tgen.mininet_cli()
 
 if __name__ == '__main__':
-    sys.exit(pytest.main(["-s"]))
+    args = ["-s"] + sys.argv[1:]
+    sys.exit(pytest.main(args))