diff options
| author | Ted Gould <ted@gould.cx> | 2014-11-05 10:59:25 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2014-11-05 10:59:25 -0600 |
| commit | 292c19d6e75ee4fa83b71cea3820d0efa6ecc5b0 (patch) | |
| tree | a3490ac944779cbcc1e98c928c38fcfaeed39a1f | |
| parent | 629fb9872de0626e957489b177f36e025f996abe (diff) | |
| download | ayatana-indicator-sound-292c19d6e75ee4fa83b71cea3820d0efa6ecc5b0.tar.gz ayatana-indicator-sound-292c19d6e75ee4fa83b71cea3820d0efa6ecc5b0.tar.bz2 ayatana-indicator-sound-292c19d6e75ee4fa83b71cea3820d0efa6ecc5b0.zip | |
Fix waiting on actions to count the number of actions
| -rw-r--r-- | tests/indicator-fixture.h | 9 | ||||
| -rw-r--r-- | tests/indicator-test.cc | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/indicator-fixture.h b/tests/indicator-fixture.h index 02dd885..987c7b7 100644 --- a/tests/indicator-fixture.h +++ b/tests/indicator-fixture.h @@ -136,10 +136,13 @@ class IndicatorFixture : public ::testing::Test } void agWaitForActions (const std::shared_ptr<GActionGroup>& group) { - auto list = g_action_group_list_actions(group.get()); + auto list = std::shared_ptr<gchar *>( + g_action_group_list_actions(group.get()), + [](gchar ** list) { + g_strfreev(list); + }); - if (list != nullptr) { - g_strfreev(list); + if (g_strv_length(list.get()) != 0) { return; } diff --git a/tests/indicator-test.cc b/tests/indicator-test.cc index c919e31..7d122ee 100644 --- a/tests/indicator-test.cc +++ b/tests/indicator-test.cc @@ -51,5 +51,5 @@ TEST_F(IndicatorTest, DesktopMenu) { TEST_F(IndicatorTest, SilentActions) { setActions("/com/canonical/indicator/sound"); - expectActionExists("indicator.root"); + expectActionExists("root"); } |