aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-10-26 14:34:07 +0100
committerXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-10-26 14:34:07 +0100
commit890b2daeab368815e1aaf5074b5b6a28fbe3a90f (patch)
tree45921825f62944d4c02e362ab71991b6dfd02549
parent698baf72cd6a606d9c8101c31e0d40b38d48a8bb (diff)
downloadayatana-indicator-sound-890b2daeab368815e1aaf5074b5b6a28fbe3a90f.tar.gz
ayatana-indicator-sound-890b2daeab368815e1aaf5074b5b6a28fbe3a90f.tar.bz2
ayatana-indicator-sound-890b2daeab368815e1aaf5074b5b6a28fbe3a90f.zip
changed wait mechanism when stopping sound
-rw-r--r--tests/integration/test-indicator.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index d55222b..d6f5c55 100644
--- a/tests/integration/test-indicator.cpp
+++ b/tests/integration/test-indicator.cpp
@@ -104,14 +104,15 @@ TEST_F(TestIndicator, PhoneChangeRoleVolume)
)
).match());
+ // initialize the signal spy
+ EXPECT_TRUE(initializeMenuChangedSignal());
userAccountsSpy.clear();
// stop the test sound, the role should change again to alert
stopTestSound();
if (randomVolume != 1.0)
{
- // we only wait if the volume in the alert and the
- // one set in the multimedia roles differ
- WAIT_FOR_SIGNALS(userAccountsSpy, 1);
+ // wait for the menu change
+ EXPECT_TRUE(waitMenuChange());
}
// check the initial volume for the alert role