diff -Nru indicator-sound-12.10.2+17.10.20170829.1/debian/changelog indicator-sound-12.10.2+18.04.20180420.3/debian/changelog --- indicator-sound-12.10.2+17.10.20170829.1/debian/changelog 2018-04-21 04:14:16.000000000 +0000 +++ indicator-sound-12.10.2+18.04.20180420.3/debian/changelog 2018-04-21 04:14:17.000000000 +0000 @@ -1,3 +1,10 @@ +indicator-sound (12.10.2+18.04.20180420.3-0ubuntu1) bionic; urgency=medium + + * tests, integration: set environment variables to work headless (LP: + #1737834) + + -- Marco Trevisan (TreviƱo) Fri, 20 Apr 2018 21:44:30 +0000 + indicator-sound (12.10.2+17.10.20170829.1-0ubuntu2) bionic; urgency=medium * No change rebuild for translations import diff -Nru indicator-sound-12.10.2+17.10.20170829.1/tests/integration/CMakeLists.txt indicator-sound-12.10.2+18.04.20180420.3/tests/integration/CMakeLists.txt --- indicator-sound-12.10.2+17.10.20170829.1/tests/integration/CMakeLists.txt 2017-08-29 15:36:06.000000000 +0000 +++ indicator-sound-12.10.2+18.04.20180420.3/tests/integration/CMakeLists.txt 2018-04-20 21:43:58.000000000 +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 -) - -if(NOT "${TESTS_USER}" STREQUAL "jenkins") - add_test( +add_test( integration-tests integration-tests - ) -endif() +) + +set_tests_properties(integration-tests PROPERTIES ENVIRONMENT + "DISPLAY='';HOME=/tmp/indicator-test-home;" +) set( SET-VOLUME-SRC diff -Nru indicator-sound-12.10.2+17.10.20170829.1/tests/integration/indicator-sound-test-base.cpp indicator-sound-12.10.2+18.04.20180420.3/tests/integration/indicator-sound-test-base.cpp --- indicator-sound-12.10.2+17.10.20170829.1/tests/integration/indicator-sound-test-base.cpp 2017-08-29 15:36:06.000000000 +0000 +++ indicator-sound-12.10.2+18.04.20180420.3/tests/integration/indicator-sound-test-base.cpp 2018-04-20 21:43:58.000000000 +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" ));