summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-02-24 17:55:11 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-03-03 18:51:00 +0100
commit286b9d2575802e87a55665629e920fcbf89b97cf (patch)
tree491ea715912135e91c73d43b13f4377221249408
parentbe766607183547244b03b92c2e9384ce3e40041b (diff)
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
-rw-r--r--openbsc/tests/ctrl_test_runner.py3
-rw-r--r--openbsc/tests/smpp_test_runner.py3
-rw-r--r--openbsc/tests/vty_test_runner.py7
3 files changed, 9 insertions, 4 deletions
diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py
index 5030e8b..02bc28a 100644
--- a/openbsc/tests/ctrl_test_runner.py
+++ b/openbsc/tests/ctrl_test_runner.py
@@ -30,7 +30,8 @@ import struct
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/smpp_test_runner.py b/openbsc/tests/smpp_test_runner.py
index 4527ac4..71b9d6c 100644
--- a/openbsc/tests/smpp_test_runner.py
+++ b/openbsc/tests/smpp_test_runner.py
@@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
+import sys
import time
import unittest
import socket
@@ -25,7 +26,7 @@ import socket
import osmopy.obscvty as obscvty
import osmopy.osmoutil as osmoutil
-confpath = '.'
+confpath = os.path.join(sys.path[0], '..')
class TestVTYBase(unittest.TestCase):
diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py
index 6c6002f..3069364 100644
--- a/openbsc/tests/vty_test_runner.py
+++ b/openbsc/tests/vty_test_runner.py
@@ -24,10 +24,13 @@ import subprocess
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):