From 9f66388199c1df8be26c1e0c7dddb2a0aa21ad00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bojan=20=C4=8Cekrli=C4=87?= <bojan@cekrlic.com>
Date: Mon, 30 Nov 2020 11:13:37 +0100
Subject: [PATCH] Temporary disable XOAuth integration tests (again).

---
 integration-tests.sh                               | 4 ++--
 integration-tests/xoauth2-error/docker-compose.yml | 2 +-
 integration-tests/xoauth2/docker-compose.yml       | 2 +-
 integration-tests/xoauth2/it/test.bats             | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/integration-tests.sh b/integration-tests.sh
index 9e9daf6..f743e57 100755
--- a/integration-tests.sh
+++ b/integration-tests.sh
@@ -28,11 +28,11 @@ if [[ $# -gt 0 ]]; then
         shift
     done
 else
-    for i in `find -maxdepth 1 -type d | grep -Ev "^./(tester)" | sort`; do
+    for i in `find -maxdepth 1 -type d | grep -Ev "^./(tester|xoauth2)" | sort`; do
         i="$(basename "$i")"
         if [ "$i" == "." ] || [ "$i" == ".." ]; then
             continue
         fi
         run_test $i
     done
-fi
\ No newline at end of file
+fi
diff --git a/integration-tests/xoauth2-error/docker-compose.yml b/integration-tests/xoauth2-error/docker-compose.yml
index ec153b6..457e91b 100644
--- a/integration-tests/xoauth2-error/docker-compose.yml
+++ b/integration-tests/xoauth2-error/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       RELAYHOST_TLS_LEVEL: "encrypt"
       XOAUTH2_CLIENT_ID: "${XOAUTH2_CLIENT_ID}"
       XOAUTH2_SECRET: "${XOAUTH2_SECRET}"
-      XOAUTH2_INITIAL_ACCESS_TOKEN: "${XOAUTH2_INITIAL_ACCESS_TOKEN}"
+      #XOAUTH2_INITIAL_ACCESS_TOKEN: "${XOAUTH2_INITIAL_ACCESS_TOKEN}"
       XOAUTH2_INITIAL_REFRESH_TOKEN: "${XOAUTH2_INITIAL_REFRESH_TOKEN}"
       XOAUTH2_SYSLOG_ON_FAILURE: "no"
       XOAUTH2_FULL_TRACE: "no"
diff --git a/integration-tests/xoauth2/docker-compose.yml b/integration-tests/xoauth2/docker-compose.yml
index 7526eeb..95eed89 100644
--- a/integration-tests/xoauth2/docker-compose.yml
+++ b/integration-tests/xoauth2/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       RELAYHOST_TLS_LEVEL: "encrypt"
       XOAUTH2_CLIENT_ID: "${XOAUTH2_CLIENT_ID}"
       XOAUTH2_SECRET: "${XOAUTH2_SECRET}"
-      XOAUTH2_INITIAL_ACCESS_TOKEN: "${XOAUTH2_INITIAL_ACCESS_TOKEN}"
+      #XOAUTH2_INITIAL_ACCESS_TOKEN: "${XOAUTH2_INITIAL_ACCESS_TOKEN}"
       XOAUTH2_INITIAL_REFRESH_TOKEN: "${XOAUTH2_INITIAL_REFRESH_TOKEN}"
       XOAUTH2_SYSLOG_ON_FAILURE: "no"
       XOAUTH2_FULL_TRACE: "no"
diff --git a/integration-tests/xoauth2/it/test.bats b/integration-tests/xoauth2/it/test.bats
index e8ed031..2775c40 100755
--- a/integration-tests/xoauth2/it/test.bats
+++ b/integration-tests/xoauth2/it/test.bats
@@ -37,6 +37,7 @@ load /common/common-xoauth2.sh
 	smtp_result=$(get_smtp_result '/logs/postfix.log' "${postfix_message_id}")
 	status=$(get_param_value "${smtp_result}" 'status')
 
+	output="$(cat /logs/postfix.log)"
 	[ -n "$status" ]
 	echo "$status" | grep -q -E "^sent"
 }