From 3bcd1ec49a4833fa2e5bfd0af8e89ce9815854b7 Mon Sep 17 00:00:00 2001
From: Allen-Webb <allenwebb@google.com>
Date: Wed, 24 Jul 2019 16:05:57 -0700
Subject: [PATCH] Update tests now that usbguard-dbus was moved into
 usbguard-daemon.

---
 src/Tests/LDAP/Sanity/ldap-nsswitch.sh | 1 -
 src/Tests/LDAP/UseCase/ldap-test-1.sh  | 1 -
 src/Tests/LDAP/UseCase/ldap-test-2.sh  | 1 -
 src/Tests/LDAP/UseCase/ldap-test-3.sh  | 1 -
 src/Tests/LDAP/UseCase/ldap-test-4.sh  | 1 -
 src/Tests/LDAP/UseCase/ldap-test-5.sh  | 1 -
 src/Tests/Makefile.am                  | 1 -
 src/Tests/UseCase/000_executable.sh    | 3 ---
 8 files changed, 10 deletions(-)

diff --git a/src/Tests/LDAP/Sanity/ldap-nsswitch.sh b/src/Tests/LDAP/Sanity/ldap-nsswitch.sh
index ea5cb751..95d997e5 100755
--- a/src/Tests/LDAP/Sanity/ldap-nsswitch.sh
+++ b/src/Tests/LDAP/Sanity/ldap-nsswitch.sh
@@ -29,7 +29,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi
diff --git a/src/Tests/LDAP/UseCase/ldap-test-1.sh b/src/Tests/LDAP/UseCase/ldap-test-1.sh
index ffaa88c9..3fb82099 100755
--- a/src/Tests/LDAP/UseCase/ldap-test-1.sh
+++ b/src/Tests/LDAP/UseCase/ldap-test-1.sh
@@ -30,7 +30,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi
diff --git a/src/Tests/LDAP/UseCase/ldap-test-2.sh b/src/Tests/LDAP/UseCase/ldap-test-2.sh
index 04c2e8c1..1a7352b9 100755
--- a/src/Tests/LDAP/UseCase/ldap-test-2.sh
+++ b/src/Tests/LDAP/UseCase/ldap-test-2.sh
@@ -30,7 +30,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi
diff --git a/src/Tests/LDAP/UseCase/ldap-test-3.sh b/src/Tests/LDAP/UseCase/ldap-test-3.sh
index b6a7131c..6ce9d561 100755
--- a/src/Tests/LDAP/UseCase/ldap-test-3.sh
+++ b/src/Tests/LDAP/UseCase/ldap-test-3.sh
@@ -30,7 +30,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi
diff --git a/src/Tests/LDAP/UseCase/ldap-test-4.sh b/src/Tests/LDAP/UseCase/ldap-test-4.sh
index 507ec6af..c63f072d 100755
--- a/src/Tests/LDAP/UseCase/ldap-test-4.sh
+++ b/src/Tests/LDAP/UseCase/ldap-test-4.sh
@@ -30,7 +30,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi
diff --git a/src/Tests/LDAP/UseCase/ldap-test-5.sh b/src/Tests/LDAP/UseCase/ldap-test-5.sh
index 80d2eac2..0269281b 100755
--- a/src/Tests/LDAP/UseCase/ldap-test-5.sh
+++ b/src/Tests/LDAP/UseCase/ldap-test-5.sh
@@ -30,7 +30,6 @@ then
     NSSWITCH=../nsswitch.sh
     USBGUARD=../../../../build/usbguard
     USBGUARD_DAEMON=../../../../build/usbguard-daemon
-    USBGUARD_DBUS=../../../../build/usbguard-dbus
 else
     source "${USBGUARD_TESTLIB_BASH}" || exit 129
 fi
diff --git a/src/Tests/Makefile.am b/src/Tests/Makefile.am
index 64fa71f6..6002200c 100644
--- a/src/Tests/Makefile.am
+++ b/src/Tests/Makefile.am
@@ -66,7 +66,6 @@ TESTS_ENVIRONMENT=\
 	USBGUARD_TESTLIB_BASH=$(top_srcdir)/src/Tests/bash-testlib.sh \
 	USBGUARD=$(top_builddir)/usbguard \
 	USBGUARD_DAEMON=$(top_builddir)/usbguard-daemon \
-	USBGUARD_DBUS=$(top_builddir)/usbguard-dbus \
 	LDAP_UTIL=$(top_srcdir)/src/Tests/LDAP/ldap.sh \
 	NSSWITCH=$(top_srcdir)/src/Tests/LDAP/nsswitch.sh
 
diff --git a/src/Tests/UseCase/000_executable.sh b/src/Tests/UseCase/000_executable.sh
index 30ea0790..3a87a3b8 100755
--- a/src/Tests/UseCase/000_executable.sh
+++ b/src/Tests/UseCase/000_executable.sh
@@ -28,7 +28,4 @@ schedule "${USBGUARD}" :valgrind
 schedule "${USBGUARD_DAEMON} -h"
 schedule "${USBGUARD_DAEMON} -h" :valgrind
 
-[ -f "${USBGUARD_DBUS}" ] && schedule "${USBGUARD_DBUS} -h"
-[ -f "${USBGUARD_DBUS}" ] && schedule "${USBGUARD_DBUS} -h" :valgrind
-
 execute 10