GnomeKeyGrabberTests: fix tests to match current behavior

(bzr r4008.7.16)

1 files changed, 7 insertions, 15 deletions

diff --git a/tests/autopilot/unity/tests/test_gnome_key_grabber.py b/tests/autopilot/unity/tests/test_gnome_key_grabber.py
index 8287487ed..d7c49f60d 100644
--- a/tests/autopilot/unity/tests/test_gnome_key_grabber.py
+++ b/tests/autopilot/unity/tests/test_gnome_key_grabber.py
@@ -154,20 +154,12 @@ class GnomeKeyGrabberTests(unity.tests.UnityTestCase):
 
 self.addCleanup(clean_up_test_grab_same_accelerator)
 
- for accelerator in accelerators:
- # Check that accelerator works
- self.assertTrue(self.press_accelerator(accelerator))
-
- # Remove accelerator
- log.info('ungrabbing %s' % accelerator)
- self.assertTrue(self.interface.UngrabAccelerator(accelerator.action))
-
- # This accelerator cannot activate any more
- self.activatable.remove(accelerator.action)
+ # Check that accelerator works
+ self.assertTrue(self.press_accelerator(accelerator))
 
- # Add them all again for one final check
- for accelerator in accelerators:
- self.activatable.add(accelerator.action)
+ # Remove accelerator
+ log.info('ungrabbing %s' % accelerator)
+ self.assertTrue(self.interface.UngrabAccelerator(accelerator.action))
 
- # Check that signal was not emitted
- self.assertFalse(self.press_accelerator(accelerators[0]))
+ for accelerator in accelerators[1:]:
+ self.assertFalse(self.press_accelerator(accelerator))