dexter submitted this change.

View Change

Approvals: dexter: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve
eIM: Make tests work with testenv

The eIM can now be tested using testenv.py.

Related: SYS#8100
Change-Id: I38364e4bd5625b301c32fd58b50e35667c64b1be
---
M _testenv/data/podman/Dockerfile
M eim/eIM_Tests.cfg
A eim/testenv.cfg
3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/_testenv/data/podman/Dockerfile b/_testenv/data/podman/Dockerfile
index 77ad49e..6a1a42a 100644
--- a/_testenv/data/podman/Dockerfile
+++ b/_testenv/data/podman/Dockerfile
@@ -169,3 +169,7 @@
cd / && \
rm -rf /tmp/mongodb && \
rm /etc/apt/sources.list.d/mongodb-org.list
+
+# Install erlang py (Erlang External Term Format)
+RUN set -x && \
+ pip3 install erlang_py --break-system-packages
diff --git a/eim/eIM_Tests.cfg b/eim/eIM_Tests.cfg
index f442022..f100c41 100644
--- a/eim/eIM_Tests.cfg
+++ b/eim/eIM_Tests.cfg
@@ -9,11 +9,11 @@
[LOGGING]

[TESTPORT_PARAMETERS]
-system.HTTP_server_port.KEYFILE := "../ipad/example_ca/pki/private/alttest.key"
-system.HTTP_server_port.CERTIFICATEFILE := "../ipad/example_ca/pki/issued/alttest.crt"
+system.HTTP_server_port.KEYFILE := "alttest.key"
+system.HTTP_server_port.CERTIFICATEFILE := "alttest.crt"

[MODULE_PARAMETERS]
-eIM_Tests.mp_restop_path := "/path/to/my/eim/restop.py"
+eIM_Tests.mp_restop_path := "./restop.py"

[MAIN_CONTROLLER]

diff --git a/eim/testenv.cfg b/eim/testenv.cfg
new file mode 100644
index 0000000..9c564c5
--- /dev/null
+++ b/eim/testenv.cfg
@@ -0,0 +1,9 @@
+[testsuite]
+program=eIM_Tests
+config=eIM_Tests.cfg
+copy=../../onomondo-eim/contrib/restop.py ../ipad/example_ca/pki/private/alttest.key ../ipad/example_ca/pki/issued/alttest.crt
+
+[eim]
+program=onomondo-eim -c "$TESTENV_INSTALL_DIR"/etc/osmocom/onomondo-eim.config -r "$TESTENV_INSTALL_DIR"/usr/lib/onomondo-eim -l debug
+make=onomondo-eim
+package=onomondo-eim

To view, visit change 42964. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I38364e4bd5625b301c32fd58b50e35667c64b1be
Gerrit-Change-Number: 42964
Gerrit-PatchSet: 4
Gerrit-Owner: jolly <andreas@eversberg.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>