diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2015-08-11 17:20:59 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2015-08-11 17:20:59 -0500 |
| commit | 156b8fd79ae38aeb3bdaaaa87257a4376a62dd41 (patch) | |
| tree | 45e50cb4b75257abd207c4313ccbc9de9b4dba74 | |
| parent | 2383bfa87a15534d94241ca6aa4332aa3e16d8aa (diff) | |
| download | ayatana-indicator-sound-156b8fd79ae38aeb3bdaaaa87257a4376a62dd41.tar.gz ayatana-indicator-sound-156b8fd79ae38aeb3bdaaaa87257a4376a62dd41.tar.bz2 ayatana-indicator-sound-156b8fd79ae38aeb3bdaaaa87257a4376a62dd41.zip | |
in tests/media-player-user, re-enable the DataSet and TimeoutTests
| -rw-r--r-- | tests/media-player-user.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/media-player-user.cc b/tests/media-player-user.cc index 876bce2..ca20b5f 100644 --- a/tests/media-player-user.cc +++ b/tests/media-player-user.cc @@ -239,7 +239,7 @@ running_update (GObject * obj, GParamSpec * pspec, bool * running) { *running = media_player_get_is_running(MEDIA_PLAYER(obj)) == TRUE; }; -TEST_F(MediaPlayerUserTest, DISABLED_DataSet) { +TEST_F(MediaPlayerUserTest, DataSet) { /* Put data into Acts */ set_property("Timestamp", g_variant_new_uint64(g_get_monotonic_time())); set_property("PlayerName", g_variant_new_string("The Player Formerly Known as Prince")); @@ -282,7 +282,7 @@ TEST_F(MediaPlayerUserTest, DISABLED_DataSet) { g_clear_object(&player); } -TEST_F(MediaPlayerUserTest, DISABLED_TimeoutTest) { +TEST_F(MediaPlayerUserTest, TimeoutTest) { /* Put data into Acts -- but 15 minutes ago */ set_property("Timestamp", g_variant_new_uint64(g_get_monotonic_time() - 15 * 60 * 1000 * 1000)); set_property("PlayerName", g_variant_new_string("The Player Formerly Known as Prince")); |