From: Rafael Zalamena <rzalamena@gmail.com>
Date: Thu, 29 Jun 2017 13:46:19 +0000 (-0300)
Subject: template: allow test to be run without pytest
X-Git-Tag: frr-7.1-dev~151^2~296
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b06e9eff759fdfc3591ed8c0336879b4609bbf98;p=mirror%2Ffrr.git

template: allow test to be run without pytest

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.
---

diff --git a/tests/topotests/example-test/__init__.py b/tests/topotests/example-test/__init__.py
old mode 100644
new mode 100755
diff --git a/tests/topotests/example-test/test_template.py b/tests/topotests/example-test/test_template.py
old mode 100644
new mode 100755
index ac6faeaa63..b7556458a2
--- a/tests/topotests/example-test/test_template.py
+++ b/tests/topotests/example-test/test_template.py
@@ -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))