[PATCH] osmo-gsm-tester[master]: trial: always use abspath

[Neels Hofmeyr]

Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/2607

to look at the new patch set (#2).

trial: always use abspath

No actual failure known, but using the abspath will prevent further problems
when running a binary in its own run dir and passing trial paths to it.

Adjust test expectations.

Change-Id: Ia2ba876a42eef9122a92645edd1f28ddb56e6be3
---
M selftest/trial_test.ok
M selftest/trial_test.ok.ign
M src/osmo_gsm_tester/trial.py
3 files changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/07/2607/2

diff --git a/selftest/trial_test.ok b/selftest/trial_test.ok
index 66dcff0..6ad39a9 100644
--- a/selftest/trial_test.ok
+++ b/selftest/trial_test.ok
@@ -11,6 +11,6 @@
 None
 - test checksum verification
 - detect wrong checksum
-ok, got RuntimeError("Checksum mismatch for 'trial_test/invalid_checksum/file2' vs. 'trial_test/invalid_checksum/checksums.md5' line 2",)
+ok, got RuntimeError("Checksum mismatch for '[PATH]/trial_test/invalid_checksum/file2' vs. '[PATH]/trial_test/invalid_checksum/checksums.md5' line 2",)
 - detect missing file
-ok, got RuntimeError("File listed in checksums file but missing in trials dir: 'trial_test/missing_file/file2' vs. 'trial_test/missing_file/checksums.md5' line 2",)
+ok, got RuntimeError("File listed in checksums file but missing in trials dir: '[PATH]/trial_test/missing_file/file2' vs. '[PATH]/trial_test/missing_file/checksums.md5' line 2",)
diff --git a/selftest/trial_test.ok.ign b/selftest/trial_test.ok.ign
index 38a82ce..1a969de 100644
--- a/selftest/trial_test.ok.ign
+++ b/selftest/trial_test.ok.ign
@@ -1,2 +1,3 @@
 /tmp/[^/]*	[TMP]
 ....-..-.._..-..-..	[TIMESTAMP]
+'[^']*/trial_test	'[PATH]/trial_test
diff --git a/src/osmo_gsm_tester/trial.py b/src/osmo_gsm_tester/trial.py
index 73e5322..6d507fb 100644
--- a/src/osmo_gsm_tester/trial.py
+++ b/src/osmo_gsm_tester/trial.py
@@ -52,7 +52,7 @@
             return Trial(trials_dir.child(next_trial)).take()
 
     def __init__(self, trial_dir):
-        self.path = trial_dir
+        self.path = os.path.abspath(trial_dir)
         self.set_name(os.path.basename(self.path))
         self.set_log_category(log.C_TST)
         self.dir = util.Dir(self.path)

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ia2ba876a42eef9122a92645edd1f28ddb56e6be3
Gerrit-PatchSet: 2
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder