osmith has uploaded this change for review.

View Change

testenv: use proper envtype for testsuite (no -b)

Fix that the testsuite was always running with the binary_repo envtype,
even if running without --binary-repo. This had the effect that PATH was
not set correctly to execute test components built with osmo-dev from
the testsuite, which broke the ipad testsuite.

Fixes: b728a7fb ("testenv: cmd: init_env: split up by envtype")
Change-Id: Ia44ec060818adcb97038043a9c6a0328c1831a15
---
M _testenv/testenv/testsuite.py
1 file changed, 4 insertions(+), 2 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/47/43847/1

diff --git a/_testenv/testenv/testsuite.py b/_testenv/testenv/testsuite.py
index b1bd8a8..52886cf 100644
--- a/_testenv/testenv/testsuite.py
+++ b/_testenv/testenv/testsuite.py
@@ -44,7 +44,8 @@
         cache_dir = "podman" if testenv.args.podman else "host"
         suffix = testenv.cmd.distro_cache_suffix()
         builddir = os.path.join(testenv.args.cache, cache_dir, f"titan-{titan_version}{suffix}")
-        path_old = testenv.cmd.generate_env(podman=testenv.args.podman)["PATH"]
+        envtype = "binary_repo" if testenv.args.binary_repo else "osmo_dev"
+        path_old = testenv.cmd.generate_env(podman=testenv.args.podman, envtype=envtype)["PATH"]
         builddir_env = {
             "BUILDDIR": builddir,
             "TTCN3_DIR": ttcn3_dir,
@@ -155,7 +156,8 @@
     if testenv.args.fast:
         env["TESTENV_FAST"] = "1"
 
-    env = testenv.cmd.generate_env(env, testenv.args.podman)
+    envtype = "binary_repo" if testenv.args.binary_repo else "osmo_dev"
+    env = testenv.cmd.generate_env(env, testenv.args.podman, envtype)
 
     cmd = [start_testsuite, suite, section_data["config"]]
 

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