Ignore missing CAP_SYS_NICE in the CI tests as we are not allowed to …

…change the nicencess. Signed-off-by: DL6ER <dl6er@dl6er.de>
pi-hole · May 28, 2020 · 5970c05 · 5970c05
1 parent 0c1ab0f
commit 5970c05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/test/run.sh b/test/run.sh
@@ -23,7 +23,7 @@ chown pihole:pihole /etc/pihole /run/pihole /var/log/pihole.log /var/log/pihole-
 cp ./pihole-FTL /home/pihole
 chmod +x /home/pihole/pihole-FTL
 # Note: We cannot add CAP_NET_RAW and CAP_NET_ADMIN at this point
-setcap CAP_NET_BIND_SERVICE,CAP_SYS_NICE+eip /home/pihole/pihole-FTL
+setcap CAP_NET_BIND_SERVICE+eip /home/pihole/pihole-FTL
 
 # Prepare gravity database
 sqlite3 /etc/pihole/gravity.db < test/gravity.db.sql

diff --git a/test/test_suite.bats b/test/test_suite.bats
@@ -358,7 +358,7 @@
 }
 
 @test "No WARNING messages in pihole-FTL.log (besides known capability issues)" {
- run bash -c 'grep "WARNING:" /var/log/pihole-FTL.log | grep -c -v -E "CAP_NET_ADMIN|CAP_NET_RAW"'
+ run bash -c 'grep "WARNING:" /var/log/pihole-FTL.log | grep -c -v -E "CAP_NET_ADMIN|CAP_NET_RAW|CAP_SYS_NICE"'
  printf "%s\n" "${lines[@]}"
  [[ ${lines[0]} == "0" ]]
 }