Merge lp:~osomon/notes-app/revert-incorrect-race-fix into lp:notes-app

[Olivier Tilloy]

Revert revision 199, which proved to not fix the issue it was attempting to address.

[Ugo Riboni (uriboni)]

Approving as it's just reverting the significant parts of a previous commit.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:201
http://10.97.0.26:8080/job/notes-app-ci/191/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-saucy/4697
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-touch/2507
    SUCCESS: http://10.97.0.26:8080/job/notes-app-saucy-amd64-ci/86
    SUCCESS: http://10.97.0.26:8080/job/notes-app-saucy-armhf-ci/89
        deb: http://10.97.0.26:8080/job/notes-app-saucy-armhf-ci/89/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/notes-app-saucy-i386-ci/86
    SUCCESS: http://10.97.0.26:8080/job/autopilot-testrunner-otto-saucy/882
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/572
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-amd64/572/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2509
        deb: http://10.97.0.26:8080/job/generic-mediumtests-builder-saucy-armhf/2509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-runner-maguro/2064
    SUCCESS: http://10.97.0.26:8080/job/generic-mediumtests-runner-mako/2077

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/191/rebuild

review: Approve (continuous-integration)

=== modified file 'Components/CollapsedNote.qml'
--- Components/CollapsedNote.qml	2013-10-04 16:12:01 +0000
+++ Components/CollapsedNote.qml	2013-10-07 09:24:00 +0000
@@ -20,8 +20,6 @@
 Item {
     clip: true
 
-    readonly property bool filled: shape.visible || label.text
-
     UbuntuShape {
         id: shape
         anchors.top: parent.top

=== modified file 'tests/autopilot/notes_app/emulators/notesapp.py'
--- tests/autopilot/notes_app/emulators/notesapp.py	2013-10-04 16:12:01 +0000
+++ tests/autopilot/notes_app/emulators/notesapp.py	2013-10-07 09:24:00 +0000
@@ -18,11 +18,6 @@
     def get_header(self):
         return self.select_single("Header")
 
-    def wait_collapsed_note_filled(self, note_item):
-        if (note_item.noteText):
-            collapsed_note = note_item.select_single("CollapsedNote")
-            collapsed_note.filled.wait_for(True)
-
     def get_note_content(self, note_item):
         return note_item.select_single("MixedEdit")
 

=== modified file 'tests/autopilot/notes_app/tests/test_images.py'
--- tests/autopilot/notes_app/tests/test_images.py	2013-10-04 16:12:01 +0000
+++ tests/autopilot/notes_app/tests/test_images.py	2013-10-07 09:24:00 +0000
@@ -51,7 +51,6 @@
 class MixinForTestImage(object):
     def test_no_crash(self):
         note = self.main_window.get_notes()[0]
-        self.main_window.wait_collapsed_note_filled(note)
 
         # Expand the note
         self.pointing_device.click_object(note)