@@ -20,7 +20,6 @@
2020
2121from __future__ import absolute_import
2222
23−from unity8.process_helpers import unlock_unity
2423from unity8.shell import with_lightdm_mock
2524from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
2625
@@ -45,11 +44,11 @@ class TestLockscreen(UnityTestCase):
4544 @with_lightdm_mock("single-pin")
4645 def test_can_unlock_pin_screen(self):
4746 """Must be able to unlock the PIN entry lock screen."""
48− unity_proxy = self.launch_unity()
47+ self.launch_unity()
4948 greeter = self.main_window.get_greeter()
5049
5150 if greeter.narrowMode:
52− unlock_unity(unity_proxy)
51+ greeter.swipe()
5352 lockscreen = self._wait_for_lockscreen()
5453 self.main_window.enter_pin_code("1234")
5554 self.assertThat(lockscreen.shown, Eventually(Equals(False)))
@@ -60,11 +59,11 @@ class TestLockscreen(UnityTestCase):
6059 @with_lightdm_mock("single-passphrase")
6160 def test_can_unlock_passphrase_screen(self):
6261 """Must be able to unlock the passphrase entry screen."""
63− unity_proxy = self.launch_unity()
62+ self.launch_unity()
6463 greeter = self.main_window.get_greeter()
6564
6665 if greeter.narrowMode:
67− unlock_unity(unity_proxy)
66+ greeter.swipe()
6867 lockscreen = self._wait_for_lockscreen()
6968 self._enter_pin_passphrase("password")
7069 self.assertThat(lockscreen.shown, Eventually(Equals(False)))
@@ -75,11 +74,11 @@ class TestLockscreen(UnityTestCase):
7574 @with_lightdm_mock("single-pin")
7675 def test_pin_screen_wrong_code(self):
7776 """Entering the wrong pin code must not dismiss the lock screen."""
78− unity_proxy = self.launch_unity()
77+ self.launch_unity()
7978 greeter = self.main_window.get_greeter()
8079
8180 if greeter.narrowMode:
82− unlock_unity(unity_proxy)
81+ greeter.swipe()
8382 lockscreen = self._wait_for_lockscreen()
8483 self.main_window.enter_pin_code("4321")
8584 pinentryField = self.main_window.get_pinentryField()
@@ -94,11 +93,11 @@ class TestLockscreen(UnityTestCase):
9493 @with_lightdm_mock("single-passphrase")
9594 def test_passphrase_screen_wrong_password(self):
9695 """Entering the wrong password must not dismiss the lock screen."""
97− unity_proxy = self.launch_unity()
96+ self.launch_unity()
9897 greeter = self.main_window.get_greeter()
9998
10099 if greeter.narrowMode:
101− unlock_unity(unity_proxy)
100+ greeter.swipe()
102101 lockscreen = self._wait_for_lockscreen()
103102 self._enter_pin_passphrase("foobar")
104103 pinentryField = self.main_window.get_pinentryField()