[PATCH] openbsc[master]: python tests: allow running from separate build dir

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Fri Feb 24 17:00:45 UTC 2017


Review at  https://gerrit.osmocom.org/1906

python tests: allow running from separate build dir

The VTY tests assume that $top_builddir == $top_srcdir. Use the script's
location from sys.path[0] to find the correct locations of example configs even
when building in another directory.

Change-Id: I2731f361e3b72d0980968e6cf83594ea450db7c2
---
M openbsc/tests/ctrl_test_runner.py
M openbsc/tests/vty_test_runner.py
2 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/06/1906/1

diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py
index 9050c09..0e3ddb6 100644
--- a/openbsc/tests/ctrl_test_runner.py
+++ b/openbsc/tests/ctrl_test_runner.py
@@ -30,7 +30,8 @@
 import osmopy.obscvty as obscvty
 import osmopy.osmoutil as osmoutil
 
-confpath = '.'
+# to be able to find $top_srcdir/doc/...
+confpath = os.path.join(sys.path[0], '..')
 verbose = False
 
 class TestCtrlBase(unittest.TestCase):
diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py
index 8b17397..084fab0 100644
--- a/openbsc/tests/vty_test_runner.py
+++ b/openbsc/tests/vty_test_runner.py
@@ -24,10 +24,13 @@
 import osmopy.obscvty as obscvty
 import osmopy.osmoutil as osmoutil
 
-sys.path.append("../contrib")
+# add $top_srcdir/contrib to find ipa.py
+sys.path.append(os.path.join(sys.path[0], '..', 'contrib'))
+
 from ipa import IPA
 
-confpath = '.'
+# to be able to find $top_srcdir/doc/...
+confpath = os.path.join(sys.path[0], '..')
 
 class TestVTYBase(unittest.TestCase):
 

-- 
To view, visit https://gerrit.osmocom.org/1906
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2731f361e3b72d0980968e6cf83594ea450db7c2
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>


More information about the gerrit-log mailing list