Revert the Can{Suspend,Hibernate} test splitting, these values are cached.

(bzr r3226.3.5)

1 files changed, 2 insertions, 16 deletions

diff --git a/tests/test_gnome_session_manager.cpp b/tests/test_gnome_session_manager.cpp
index 2a43517a3..40a6f5493 100644
--- a/tests/test_gnome_session_manager.cpp
+++ b/tests/test_gnome_session_manager.cpp
@@ -331,26 +331,12 @@ TEST_F(TestGnomeSessionManager, CanShutdown)
 EXPECT_EQ(manager->CanShutdown(), can_shutdown_);
 }
 
-TEST_F(TestGnomeSessionManager, CanHibernateUPower)
-{
- // disable logind
- logind_->GetObjects().front()->SetMethodsCallsHandler(nullptr);
- EXPECT_EQ(manager->CanHibernate(), can_hibernate_);
-}
-
-TEST_F(TestGnomeSessionManager, CanHibernateLogind)
+TEST_F(TestGnomeSessionManager, CanHibernate)
 {
 EXPECT_EQ(manager->CanHibernate(), can_hibernate_);
 }
 
-TEST_F(TestGnomeSessionManager, CanSuspendUPower)
-{
- // disable logind
- logind_->GetObjects().front()->SetMethodsCallsHandler(nullptr);
- EXPECT_EQ(manager->CanSuspend(), can_suspend_);
-}
-
-TEST_F(TestGnomeSessionManager, CanSuspendLogind)
+TEST_F(TestGnomeSessionManager, CanSuspend)
 {
 EXPECT_EQ(manager->CanSuspend(), can_suspend_);
 }