commit cf28db76b3fb5d759fa6cdf64949f8ce52c18f6f
author Stefan Seelmann <mail@stefan-seelmann.de> Sun Jun 23 22:35:57 2019 +0200
committer Stefan Seelmann <mail@stefan-seelmann.de> Sun Jun 23 22:35:57 2019 +0200
tree f85e5f3169b3cc5f5220c527d5f356462614cd74
parent 920a2b8cc37fefcb23f61d416df96f6b8ea224e5

DIRSERVER-2197: assert no duplicate files in installers

installers/src/test/docker/archive.test

diff --git a/installers/src/test/docker/archive.test b/installers/src/test/docker/archive.test
index d85579d..52b611a 100644
--- a/installers/src/test/docker/archive.test
+++ b/installers/src/test/docker/archive.test
@@ -122,7 +122,7 @@
 # assert password warning in log
 grep ".*WARN.*admin password.*security breach.*" /opt/${DIRNAME}/instances/default/log/apacheds.log
 # assert no error in log
-#! grep ".*ERROR.*" /opt/${DIRNAME}/instances/default/log/apacheds.log
+grep ".*ERROR.*" /opt/${DIRNAME}/instances/default/log/apacheds.log && false
 
 # SUCCESS
 echo "SUCCESS"

installers/src/test/docker/bin-DIRSERVER-2173.test

diff --git a/installers/src/test/docker/bin-DIRSERVER-2173.test b/installers/src/test/docker/bin-DIRSERVER-2173.test
index ebab73a..c494e10 100644
--- a/installers/src/test/docker/bin-DIRSERVER-2173.test
+++ b/installers/src/test/docker/bin-DIRSERVER-2173.test
@@ -104,7 +104,7 @@
 # assert password warning in log
 grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log
 # assert no error in log
-#! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
+grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log && false
 
 # SUCCESS
 echo "SUCCESS"

installers/src/test/docker/bin.test

diff --git a/installers/src/test/docker/bin.test b/installers/src/test/docker/bin.test
index 47c02af..1ae9dbc 100644
--- a/installers/src/test/docker/bin.test
+++ b/installers/src/test/docker/bin.test
@@ -103,7 +103,7 @@
 # assert password warning in log
 grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log
 # assert no error in log
-#! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
+grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log && false
 
 # SUCCESS
 echo "SUCCESS"

installers/src/test/docker/deb.test

diff --git a/installers/src/test/docker/deb.test b/installers/src/test/docker/deb.test
index cb81731..8fa99b8 100644
--- a/installers/src/test/docker/deb.test
+++ b/installers/src/test/docker/deb.test
@@ -40,6 +40,9 @@
 apt-get -qq -y install ldap-utils netcat procps
 command -v java >/dev/null 2>&1 || apt-get -qq -y install default-jre-headless
 
+# assert no duplicate files (DIRSERVER-2197)
+test $(dpkg -c /apacheds.deb | sort | uniq -cd | wc -l) -eq 0
+
 # install
 dpkg -i /apacheds.deb
 
@@ -91,7 +94,7 @@
 # assert password warning in log
 grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log
 # assert no error in log
-#! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
+grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log && false
 
 # uninstall
 dpkg -P apacheds

installers/src/test/docker/rpm.test

diff --git a/installers/src/test/docker/rpm.test b/installers/src/test/docker/rpm.test
index 4838a58..7d8ccc6 100644
--- a/installers/src/test/docker/rpm.test
+++ b/installers/src/test/docker/rpm.test
@@ -42,6 +42,9 @@
 yum -y -q install openldap-clients nmap procps
 command -v java >/dev/null 2>&1 || yum -y -q install java-openjdk-headless
 
+# assert no duplicate files (DIRSERVER-2197)
+test $(rpm -qlp /apacheds.rpm | sort | uniq -cd | wc -l) -eq 0
+
 # install ApacheDS
 rpm -Uvh apacheds.rpm
 
@@ -93,7 +96,7 @@
 # assert password warning in log
 grep ".*WARN.*admin password.*security breach.*" /var/lib/${DIRNAME}/default/log/apacheds.log
 # assert no error in log
-#! grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log
+grep ".*ERROR.*" /var/lib/${DIRNAME}/default/log/apacheds.log && false
 
 # uninstall
 rpm -e apacheds