1
=== modified file 'tests/autopilot/camera_app/tests/test_capture.py'
2
--- tests/autopilot/camera_app/tests/test_capture.py	2013-05-28 16:39:40 +0000
3
+++ tests/autopilot/camera_app/tests/test_capture.py	2013-09-20 12:09:04 +0000
4
@@ -64,6 +64,9 @@
5
64
            time.sleep(1)
64
            time.sleep(1)
6
65
        self.assertEquals(one_picture_on_disk, True)
65
        self.assertEquals(one_picture_on_disk, True)
7
66
66
8
67
        # check that the camera is able to capture another photo
9
68
        self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
10
69
11
67
    """Tests clicking on the record control and checks if the flash changes
70
    """Tests clicking on the record control and checks if the flash changes
12
68
    to torch off mode and the recording time appears"""
71
    to torch off mode and the recording time appears"""
13
69
    @unittest.skipIf(model() != 'Desktop', 'recording not available on device yet')
72
    @unittest.skipIf(model() != 'Desktop', 'recording not available on device yet')
14
@@ -138,15 +141,18 @@
15
138
141
16
139
    """Test that the shoot button gets disabled for a while then re-enabled
142
    """Test that the shoot button gets disabled for a while then re-enabled
17
140
    after shooting"""
143
    after shooting"""
18
144
    @unittest.skip("Disabled this test due race condition see bug 1227373")
19
141
    def test_shoot_button_disable(self):
145
    def test_shoot_button_disable(self):
20
142
        exposure_button = self.main_window.get_exposure_button()
146
        exposure_button = self.main_window.get_exposure_button()
21
143
147
22
144
        # The focus ring should be invisible in the beginning
148
        # The focus ring should be invisible in the beginning
24
145
        self.assertEquals(exposure_button.enabled, True)
149
        self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
25
146
150
26
147
        # Now take the picture! (Give it a little time to animate)
151
        # Now take the picture! (Give it a little time to animate)
27
148
        self.pointing_device.move_to_object(exposure_button)
152
        self.pointing_device.move_to_object(exposure_button)
28
149
        self.pointing_device.click()
153
        self.pointing_device.click()
29
150
154
30
155
        # autopilot might check this too late, so the exposure_button.enabled
31
156
        # is True again already before the first check
32
151
        self.assertThat(exposure_button.enabled, Eventually(Equals(False)))
157
        self.assertThat(exposure_button.enabled, Eventually(Equals(False)))
33
152
        self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
158
        self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2013-09-20
Omer Akram (community)		2013-09-20	Approve on 2013-09-20
Review via email: mp+186753@code.launchpad.net