Merge lp:~dobey/indicator-sound/test-pulseaudio-exception into lp:indicator-sound

Proposed by dobey on 2017-03-27
Status: Work in progress
Proposed branch: lp:~dobey/indicator-sound/test-pulseaudio-exception
Merge into: lp:indicator-sound
Diff against target: 39 lines (+9/-1)
2 files modified
tests/integration/indicator-sound-test-base.cpp (+1/-0)
tests/integration/main.cpp (+8/-1)
To merge this branch: bzr merge lp:~dobey/indicator-sound/test-pulseaudio-exception
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Needs Fixing on 2017-03-27
Indicator Applet Developers 2017-03-27 Pending
Review via email: mp+321102@code.launchpad.net

Commit message

DO NOT MERGE

Description of the change

DO NOT MERGE

To post a comment you must log in.
549. By dobey on 2017-03-27

Remove libpam-systemd dep.

550. By dobey on 2017-03-27

Create the XDG dirs.

551. By dobey on 2017-03-27

Also need glib.h

552. By dobey on 2017-03-27

Fix directory mode

unity-api-1-bot (unity-api-1-bot) wrote :
review: Needs Fixing (continuous-integration)

Unmerged revisions

552. By dobey on 2017-03-27

Fix directory mode

551. By dobey on 2017-03-27

Also need glib.h

550. By dobey on 2017-03-27

Create the XDG dirs.

549. By dobey on 2017-03-27

Remove libpam-systemd dep.

548. By dobey on 2017-03-27

Unset XDG_RUNTIME_DIR.

547. By Xavi Garcia on 2017-02-08

Added libpam-systemd for testing

546. By Xavi Garcia on 2017-02-07

dump pulseaudio log file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/integration/indicator-sound-test-base.cpp'
2--- tests/integration/indicator-sound-test-base.cpp 2016-03-16 14:00:47 +0000
3+++ tests/integration/indicator-sound-test-base.cpp 2017-03-27 19:12:22 +0000
4@@ -339,6 +339,7 @@
5 catch (exception const& e)
6 {
7 cout << "pulseaudio(): " << e.what() << endl;
8+ system("cat /tmp/pulse-daemon.log");
9 throw;
10 }
11 }
12
13=== modified file 'tests/integration/main.cpp'
14--- tests/integration/main.cpp 2015-12-23 13:35:46 +0000
15+++ tests/integration/main.cpp 2017-03-27 19:12:22 +0000
16@@ -22,8 +22,10 @@
17 #include <QCoreApplication>
18 #include <QTimer>
19 #include <gtest/gtest.h>
20-
21+#include <glib.h>
22 #include <libqtdbusmock/DBusMock.h>
23+#include <sys/stat.h>
24+#include <sys/types.h>
25
26 #include "dbus-types.h"
27
28@@ -43,6 +45,11 @@
29 {
30 qputenv("LANG", "C.UTF-8");
31 unsetenv("LC_ALL");
32+ unsetenv("XDG_RUNTIME_DIR");
33+
34+ mkdir(g_get_user_config_dir(), 0770);
35+ mkdir(g_get_user_data_dir(), 0770);
36+ mkdir(g_get_user_cache_dir(), 0770);
37
38 QCoreApplication application(argc, argv);
39 DBusMock::registerMetaTypes();

Subscribers

People subscribed via source and target branches