Merge lp:~3v1n0/indicator-sound/tests-environment-fixes into lp:indicator-sound

[Marco Trevisan (Treviño)]

tests, integration: set environment variables to work headless

[Marco Trevisan (Treviño) (3v1n0)]

Considering this build went fine, self-approving:

See https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3244/+packages (https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3244/+build/14782291/+files/buildlog_ubuntu-bionic-amd64.indicator-sound_12.10.2+18.04.20180420.3-0ubuntu1_BUILDING.txt.gz)

review: Approve

[Sebastien Bacher (seb128)]

good work Marco!

=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2017-03-28 14:52:39 +0000
+++ tests/integration/CMakeLists.txt	2018-04-20 21:42:05 +0000
@@ -74,25 +74,14 @@
     gmenuharness-shared
 )
 
-####
-## When building under jenkins, pulseuadio fails to start as there is no
-## /run/user tree, HOME directory is missing, and similar issues. So here
-## we check that we are the jenkins user, and avoid the integration tests,
-## until such time in future when we can run these tests in some different
-## manner to avoid needing to run pulseaudio in this way.
-####
-execute_process(
-  COMMAND whoami
-  OUTPUT_VARIABLE TESTS_USER
-  OUTPUT_STRIP_TRAILING_WHITESPACE
+add_test(
+    integration-tests
+    integration-tests
 )
 
-if(NOT "${TESTS_USER}" STREQUAL "jenkins")
-  add_test(
-    integration-tests
-    integration-tests
-  )
-endif()
+set_tests_properties(integration-tests PROPERTIES ENVIRONMENT
+    "DISPLAY='';HOME=/tmp/indicator-test-home;"
+)
 
 set(
     SET-VOLUME-SRC
 
=== modified file 'tests/integration/indicator-sound-test-base.cpp'
--- tests/integration/indicator-sound-test-base.cpp	2016-03-16 14:00:47 +0000
+++ tests/integration/indicator-sound-test-base.cpp	2018-04-20 21:42:05 +0000
@@ -297,7 +297,7 @@
                                                       << QString("--load=module-null-sink sink_name=indicator_sound_test_speaker sink_properties=device.bus=%1").arg(getDevicePortString(speakerPort))
                                                       << QString("--load=module-null-sink sink_name=indicator_sound_test_headphones sink_properties=device.bus=%1").arg(getDevicePortString(headphonesPort))
                                                       << QString("--load=module-null-sink sink_name=indicator_sound_test_mic")
-                                                      << "--log-target=file:/tmp/pulse-daemon.log"
+                                                      << "--log-target=file:/tmp/indicator-sound-test-pulse-daemon-desktop.log"
                                                       << "--load=module-dbus-protocol"
                                                       << "--load=module-native-protocol-tcp auth-ip-acl=127.0.0.1"
                 ));
@@ -329,8 +329,8 @@
                                                       << QString("--load=module-null-sink sink_name=indicator_sound_test_speaker sink_properties=device.bus=%1").arg(getDevicePortString(speakerPort))
                                                       << QString("--load=module-null-sink sink_name=indicator_sound_test_headphones sink_properties=device.bus=%1").arg(getDevicePortString(headphonesPort))
                                                       << QString("--load=module-null-sink sink_name=indicator_sound_test_mic")
-                                                      << "--log-target=file:/tmp/pulse-daemon.log"
                                                       << QString("--load=module-stream-restore restore_device=false restore_muted=false fallback_table=%1").arg(STREAM_RESTORE_TABLE)
+                                                      << "--log-target=file:/tmp/indicator-sound-test-pulse-daemon-phone.log"
                                                       << "--load=module-dbus-protocol"
                                                       << "--load=module-native-protocol-tcp auth-ip-acl=127.0.0.1"
                 ));