ubuntu-touch-coreapps-reviewers team mailing list archive

[Carla Sella <carla.sella@xxxxxxxxx>]

Carla Sella has proposed merging lp:~carla-sella/ubuntu-filemanager-app/fixed-test-cut-directory into lp:ubuntu-filemanager-app.

Commit message:
Autopilot test for Filemanager App

Requested reviews:
  Nicholas Skaggs (nskaggs)

For more details, see:
https://code.launchpad.net/~carla-sella/ubuntu-filemanager-app/fixed-test-cut-directory/+merge/252205

Fixed problem with test_cut_directory the test failed with:
raceback (most recent call last):
  File "/home/phablet/autopilot/filemanager/tests/test_filemanager.py", line 355, in test_cut_directory
    os.mkdir(destination_dir_path)
FileExistsError: [Errno 17] File exists: '/home/phablet/destination'
-- 
Your team Ubuntu File Manager Developers is subscribed to branch lp:ubuntu-filemanager-app.

=== modified file 'po/com.ubuntu.filemanager.pot'
--- po/com.ubuntu.filemanager.pot	2015-02-13 14:09:47 +0000
+++ po/com.ubuntu.filemanager.pot	2015-03-07 15:47:22 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-07 00:30+0100\n"
+"POT-Creation-Date: 2015-03-07 15:02+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -27,12 +27,13 @@
 msgstr[1] ""
 
 #: ../src/app/qml/components/PathHistoryRow.qml:84
-#: ../src/app/qml/ui/FolderListPage.qml:813
+#: ../src/app/qml/ui/FolderListPage.qml:830
 msgid "Device"
 msgstr ""
 
 #: ../src/app/qml/components/PlacesSidebar.qml:53
-#: ../src/app/qml/ui/PlacesPage.qml:27 ../src/app/qml/ui/PlacesPopover.qml:102
+#: ../src/app/qml/ui/FolderListPage.qml:31 ../src/app/qml/ui/PlacesPage.qml:27
+#: ../src/app/qml/ui/PlacesPopover.qml:102
 msgid "Places"
 msgstr ""
 
@@ -84,8 +85,8 @@
 #: ../src/app/qml/ui/FileActionDialog.qml:45
 #: ../src/app/qml/ui/FileOperationProgressDialog.qml:44
 #: ../src/app/qml/ui/FolderListPage.qml:343
-#: ../src/app/qml/ui/FolderListPage.qml:656
-#: ../src/app/qml/ui/FolderListPage.qml:723
+#: ../src/app/qml/ui/FolderListPage.qml:673
+#: ../src/app/qml/ui/FolderListPage.qml:740
 #: ../src/app/qml/ui/GoToDialog.qml:67
 msgid "Cancel"
 msgstr ""
@@ -164,7 +165,7 @@
 
 #: ../src/app/qml/ui/FolderListPage.qml:79
 #: ../src/app/qml/ui/FolderListPage.qml:97
-#: ../src/app/qml/ui/FolderListPage.qml:593
+#: ../src/app/qml/ui/FolderListPage.qml:610
 msgid "Properties"
 msgstr ""
 
@@ -219,123 +220,123 @@
 msgid "Select"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:408
+#: ../src/app/qml/ui/FolderListPage.qml:425
 msgid "No files"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:428
-#: ../src/app/qml/ui/FolderListPage.qml:554
+#: ../src/app/qml/ui/FolderListPage.qml:445
+#: ../src/app/qml/ui/FolderListPage.qml:571
 msgid "Delete"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:429
+#: ../src/app/qml/ui/FolderListPage.qml:446
 #, qt-format
 msgid "Are you sure you want to permanently delete '%1'?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:434
+#: ../src/app/qml/ui/FolderListPage.qml:451
 msgid "Deleting files"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:452
-#: ../src/app/qml/ui/FolderListPage.qml:567
+#: ../src/app/qml/ui/FolderListPage.qml:469
+#: ../src/app/qml/ui/FolderListPage.qml:584
 msgid "Rename"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:453
+#: ../src/app/qml/ui/FolderListPage.qml:470
 msgid "Enter a new name"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:462
+#: ../src/app/qml/ui/FolderListPage.qml:479
 msgid "Could not rename"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:463
+#: ../src/app/qml/ui/FolderListPage.qml:480
 msgid "Insufficient permissions or name already exists?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:481
+#: ../src/app/qml/ui/FolderListPage.qml:498
 msgid "Extract Archive"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:482
+#: ../src/app/qml/ui/FolderListPage.qml:499
 #, qt-format
 msgid "Are you sure you want to extract '%1' here?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:531
+#: ../src/app/qml/ui/FolderListPage.qml:548
 msgid "Cut"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:542
+#: ../src/app/qml/ui/FolderListPage.qml:559
 msgid "Copy"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:582
-#: ../src/app/qml/ui/FolderListPage.qml:703
+#: ../src/app/qml/ui/FolderListPage.qml:599
+#: ../src/app/qml/ui/FolderListPage.qml:720
 msgid "Extract archive"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:613
+#: ../src/app/qml/ui/FolderListPage.qml:630
 msgid "File operation error"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:644
+#: ../src/app/qml/ui/FolderListPage.qml:661
 #, qt-format
 msgid "Extracting archive '%1'"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:665
+#: ../src/app/qml/ui/FolderListPage.qml:682
 msgid "OK"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:680
+#: ../src/app/qml/ui/FolderListPage.qml:697
 msgid "Extracting failed"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:681
+#: ../src/app/qml/ui/FolderListPage.qml:698
 #, qt-format
 msgid "Extracting the archive '%1' failed."
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:695
+#: ../src/app/qml/ui/FolderListPage.qml:712
 msgid "Archive file"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:696
+#: ../src/app/qml/ui/FolderListPage.qml:713
 msgid "Do you want to extract the archive here?"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:713
+#: ../src/app/qml/ui/FolderListPage.qml:730
 msgid "Open with another app"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:781
+#: ../src/app/qml/ui/FolderListPage.qml:798
 msgid "~/Desktop"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:791
+#: ../src/app/qml/ui/FolderListPage.qml:808
 msgid "~/Public"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:793
+#: ../src/app/qml/ui/FolderListPage.qml:810
 msgid "~/Programs"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:795
+#: ../src/app/qml/ui/FolderListPage.qml:812
 msgid "~/Templates"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:811
+#: ../src/app/qml/ui/FolderListPage.qml:828
 msgid "Home"
 msgstr ""
 
-#: ../src/app/qml/ui/FolderListPage.qml:881
+#: ../src/app/qml/ui/FolderListPage.qml:898
 msgid "Folder not accessible"
 msgstr ""
 
 #. TRANSLATORS: this refers to a folder name
-#: ../src/app/qml/ui/FolderListPage.qml:883
+#: ../src/app/qml/ui/FolderListPage.qml:900
 #, qt-format
 msgid "Can not access %1"
 msgstr ""

=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
--- tests/autopilot/filemanager/tests/test_filemanager.py	2015-02-10 20:31:25 +0000
+++ tests/autopilot/filemanager/tests/test_filemanager.py	2015-03-07 15:47:22 +0000
@@ -21,6 +21,7 @@
 import mimetypes
 
 import os
+import shutil
 
 from autopilot import process
 from autopilot.platform import model
@@ -353,10 +354,10 @@
                                             'destination')
         destination_dir_name = os.path.basename(destination_dir_path)
         os.mkdir(destination_dir_path)
+        self.addCleanup(shutil.rmtree, destination_dir_path)
         dir_to_cut_path = os.path.join(self.fakehome, 'to_cut')
         dir_to_cut_name = os.path.basename(dir_to_cut_path)
         os.mkdir(dir_to_cut_path)
-
         folder_list_page = self.app.main_view.get_folder_list_page()
         self._assert_number_of_files(2)