Merge lp:~canonical-platform-qa/ubuntu-filemanager-app/fix-context-menu-autopilot-test into lp:ubuntu-filemanager-app

[Chris Gagnon]

fix broken autopilot test in test_context_menu

fix broken autopilot test in test_context_menu

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:338
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/ubuntu-filemanager-app/fix-context-menu-autopilot-test/+merge/243349/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/414/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/401
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/401/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/36

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/414/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

If this change is made, it should also be made to test_rename_file. What bug are you seeing that makes the assertEquals fail or otherwise not be representative?

review: Needs Fixing

[Chris Gagnon (chris.gagnon)]

http://ci.ubuntu.com/smokeng/vivid/touch/mako/38:20141130:20141119/11533/filemanager/1962713/ is the failing test

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:338
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/415/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/402
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/402/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/37

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/415/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/ubuntu-filemanager-app/fix-context-menu-autopilot-test]

339. By Chris Gagnon on 2014-12-02

fix the other tests in test_context_menu

[Chris Gagnon (chris.gagnon)]

I've update all the test cases in test_context_menu

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:339
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/416/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid/403/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/38/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/416/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

LGTM, thanks for fixing the rest of these.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/filemanager/tests/test_context_menu.py'
--- tests/autopilot/filemanager/tests/test_context_menu.py	2014-09-22 21:43:02 +0000
+++ tests/autopilot/filemanager/tests/test_context_menu.py	2014-12-02 17:52:30 +0000
@@ -38,7 +38,7 @@
         self.app.main_view.rename(original_directory, new_name)
 
         files_and_folders = self.get_current_directory_files_and_folders()
-        self.assertEquals(files_and_folders, [new_name])
+        self.assertTrue(new_name in files_and_folders)
 
     def test_rename_file(self):
         """Test renaming a file.
@@ -52,7 +52,7 @@
         self.app.main_view.rename(original_file, new_name)
 
         files_and_folders = self.get_current_directory_files_and_folders()
-        self.assertEquals(files_and_folders, [new_name])
+        self.assertTrue(new_name in files_and_folders)
 
     def test_delete_directory(self):
         """Test deleting a directory.
@@ -66,7 +66,7 @@
         self.app.main_view.delete(dir_name)
 
         files_and_folders = self.get_current_directory_files_and_folders()
-        self.assertEquals(files_and_folders, [])
+        self.assertFalse(dir_name in files_and_folders)
 
     def test_delete_file(self):
         """Test deleting a file.
@@ -79,4 +79,4 @@
         self.app.main_view.delete(file_name)
 
         files_and_folders = self.get_current_directory_files_and_folders()
-        self.assertEquals(files_and_folders, [])
+        self.assertFalse(file_name in files_and_folders)