From 7b56f5d9bef61c1da8732c77e6ff7cc82abd3a00 Mon Sep 17 00:00:00 2001
From: Frank Ueberschar <frank.ueberschar@bareos.com>
Date: Fri, 20 Dec 2019 11:30:01 +0100
Subject: [PATCH] regress: disabled python-bareos-connection-test

---
 regress/DartTestfile.txt.in                 |  1 -
 regress/tests/python-bareos-connection-test | 43 ---------------------
 systemtests/tests/TODO.txt                  |  1 -
 3 files changed, 45 deletions(-)
 delete mode 100755 regress/tests/python-bareos-connection-test

diff --git a/regress/DartTestfile.txt.in b/regress/DartTestfile.txt.in
index 825c737c57a..77001f716ef 100644
--- a/regress/DartTestfile.txt.in
+++ b/regress/DartTestfile.txt.in
@@ -2,7 +2,6 @@ ADD_TEST(disk:webui-connection-test "@webuidir@/tests/regress/webui-bsock-connec
 ADD_TEST(disk:webui-connection-test-tls "@webuidir@/tests/regress/webui-bsock-connection-test-tls")
 #ADD_TEST(disk:tray-monitor-connection-test-cleartext "@regressdir@/tests/tray-monitor-connection-test-cleartext")
 #ADD_TEST(disk:tray-monitor-connection-test-tls-psk "@regressdir@/tests/tray-monitor-connection-test-tls-psk")
-ADD_TEST(disk:python-bareos-connection-test "@regressdir@/tests/python-bareos-connection-test")
 ADD_TEST(disk:lan-addr-test "@regressdir@/tests/lan-addr-test")
 ADD_TEST(disk:lan-addr-test-passive "@regressdir@/tests/lan-addr-test-passive")
 #ADD_TEST(disk:always-incremental-test "@regressdir@/tests/always-incremental-test")
diff --git a/regress/tests/python-bareos-connection-test b/regress/tests/python-bareos-connection-test
deleted file mode 100755
index c83bace681d..00000000000
--- a/regress/tests/python-bareos-connection-test
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# Run a simple connection test
-#   with Python-Bareos
-#
-TestName="python-bareos-connection-test"
-
-bareos_python_test_script="python-bareos-test.py"
-bareos_python_module_source_dir="../python-bareos"
-python_interpreter="python"
-python_tlspsk_module="sslpsk"
-
-. scripts/functions
-
-scripts/cleanup
-copy_configs
-
-start_test
-run_bareos
-
-error_occurred=0
-
-if [ -z `command -v ${python_interpreter}` ]; then
-  echo "Error: Could not find python interpreter."
-  error_occurred=1
-elif ! python -c "import ${python_tlspsk_module}"; then
-  echo "Error: Could not import python module \"${python_tlspsk_module}\"."
-  error_occurred=1
-else
-  PYTHONPATH=${bareos_python_module_source_dir} ${python_interpreter} configs/${TestName}/${bareos_python_test_script}
-  if [ $? != 0 ]; then
-    echo "Python-Bareos test failed."
-    error_occurred=1
-  fi
-fi
-
-stop_bareos
-
-export estat
-let estat=error_occurred
-
-end_test
-
diff --git a/systemtests/tests/TODO.txt b/systemtests/tests/TODO.txt
index ac5b6c5dbbc..542038c48f9 100644
--- a/systemtests/tests/TODO.txt
+++ b/systemtests/tests/TODO.txt
@@ -100,7 +100,6 @@ disk:prune-config-test
 disk:prune-copy-test
 disk:prune-migration-test
 disk:prune-test
-disk:python-bareos-connection-test
 disk:query-test
 disk:quota-hardquota-test
 disk:quota-includefailed-test