[MERGED] osmo-gsm-tester[master]: lock test: make more robust against timing

[Neels Hofmeyr]

Neels Hofmeyr has submitted this change and it was merged.

Change subject: lock test: make more robust against timing
......................................................................


lock test: make more robust against timing

Remove the stdout printing from the lock_test_help.py, so that there is no
problem with a failing test because one output ending up in stdout before the
other. So only output the current lock from lock_test.sh.

Change-Id: I7fe80a9de88ddee1d66ca5c692948fc9673e4230
---
M selftest/lock_test.ok
M selftest/lock_test_help.py
2 files changed, 0 insertions(+), 8 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/selftest/lock_test.ok b/selftest/lock_test.ok
index 0e3db40..d7152ac 100644
--- a/selftest/lock_test.ok
+++ b/selftest/lock_test.ok
@@ -1,8 +1,4 @@
-acquired lock: 'long name'
 launched first, locked by: long name
 launched second, locked by: long name
-leaving lock: 'long name'
-acquired lock: 'shorter'
 waited, locked by: shorter
-leaving lock: 'shorter'
 waited more, locked by: 
diff --git a/selftest/lock_test_help.py b/selftest/lock_test_help.py
index 7b6dfa1..bdf7c64 100644
--- a/selftest/lock_test_help.py
+++ b/selftest/lock_test_help.py
@@ -14,12 +14,8 @@
 fl = FileLock(lockfile_path, name)
 
 with fl:
-    print('acquired lock: %r' % fl.owner)
-    sys.stdout.flush()
     while os.path.exists(stop_signalling_file):
         time.sleep(.1)
-    print('leaving lock: %r' % fl.owner)
-    sys.stdout.flush()
 touch_file(stop_signalling_file + '.done')
 
 # vim: expandtab tabstop=4 shiftwidth=4

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7fe80a9de88ddee1d66ca5c692948fc9673e4230
Gerrit-PatchSet: 4
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>