wip

Signed-off-by: roman khapov <[email protected]>

Author: rkhapov

docker/functional/bin/ody-stop

@@ -94,6 +94,10 @@ def main():
     print('Odyssey pids to stop:', ', '.join(list(map(str, pids))))
 
     for pid in pids:
+        # check if process failed because of asan (will work only if pid was an argument)
+        if not asan_log_is_valid(pid) or not tsan_log_is_valid(pid):
+            exit(1)
+
         if not terminate_gracefully(pid, timeout):
             print(f'Process {pid} didnt finish within {timeout} seconds')
             print(subprocess.check_output(['gdb', '-p', str(pid), '--batch', '-ex',

docker/functional/tests/ldap/runner.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash -eux
 
 ldapadd -x -H ldap://192.168.233.16 -D "cn=admin,dc=example,dc=org" -wadmin -f /tests/ldap/usr1.ldif
 # wait for ldap server to do smt
@@ -11,54 +11,56 @@ ldapadd -x -H ldap://192.168.233.16 -D "cn=admin,dc=example,dc=org" -wadmin -f /
 sleep 1
 
 /usr/bin/odyssey /tests/ldap/odyssey.conf
+sleep 1
+odyssey_pid=$(pidof odyssey)
 
 PGPASSWORD=lolol psql -h localhost -p 6432 -U user1 -c "select 1" ldap_db >/dev/null 2>&1 || {
     echo "error: failed to successfully auth with correct password"
-    ody-stop
+    ody-stop $odyssey_pid
     cat /var/log/odyssey.log
     exit 1
 }
 
 PGPASSWORD=notlolol psql -h localhost -p 6432 -U user1 -c "select 1" ldap_db >/dev/null 2>&1 && {
     echo "error:  successfully auth with incorrect password"
-    ody-stop
+    ody-stop $odyssey_pid
     cat /var/log/odyssey.log
     exit 1
 }
 
 PGPASSWORD=default psql -h localhost -p 6432 -U user3 -c "select 1" ldap_db >/dev/null 2>&1 && {
     echo "error: failed to successfully auth with correct password as default user"
-    ody-stop
+    ody-stop $odyssey_pid
     cat /var/log/odyssey.log
     exit 1
 }
 
 PGPASSWORD=notdefault psql -h localhost -p 6432 -U user3 -c "select 1" ldap_db >/dev/null 2>&1 && {
     echo "error:  successfully auth with incorrect password as default user"
-    ody-stop
+    ody-stop $odyssey_pid
     cat /var/log/odyssey.log
     exit 1
 }
 
 PGPASSWORD=default psql -h localhost -p 6432 -U user4 -c "select current_user" ldap_db1 2>/dev/null | grep ldap_readonly | wc -l  | grep -q '1' || {
     echo "error: failed to successfully auth with correct password and correct db"
-    ody-stop
+    ody-stop $odyssey_pid
     cat /var/log/odyssey.log
     exit 1
 }
 
 PGPASSWORD=default psql -h localhost -p 6432 -U user4 -c "select current_user" ldap_db2 2>/dev/null | grep ldap_rw | wc -l  | grep -q '1' || {
     echo "error: failed to successfully auth with correct password and correct db"
-    ody-stop
+    ody-stop $odyssey_pid
     cat /var/log/odyssey.log
     exit 1
 }
 
 PGPASSWORD=notdefault psql -h localhost -p 6432 -U user4 -c "select 1" ldap_db1 >/dev/null 2>&1 && {
     echo "error:  successfully auth with incorrect password"
-    ody-stop
+    ody-stop $odyssey_pid
     cat /var/log/odyssey.log
     exit 1
 }
 
-ody-stop
+ody-stop $odyssey_pid