Merge pull request #32369 from mozilla-b2g/revert-32299-1212375

Revert "Bug 1212375 - Fix up file_manager.remove in gaia_test.py"
mozilla-b2g · Oct 9, 2015 · 496e8df · 496e8df
2 parents c3a5bf3 + 61da378
commit 496e8df
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/tests/python/gaia-ui-tests/gaiatest/gaia_test.py b/tests/python/gaia-ui-tests/gaiatest/gaia_test.py
@@ -940,14 +940,15 @@ def cleanup_storage(self):
         storage_paths = [self.device.storage_path]
         if self.device.is_android_build:
             # TODO: Remove hard-coded paths once bug 1018079 is resolved
-            storage_paths.extend(['/mnt/sdcard',
-                                  '/mnt/extsdcard',
-                                  '/storage/sdcard',
-                                  '/storage/sdcard0',
-                                  '/storage/sdcard1'])
+            storage_paths.extend(['/mnt/sdcard/',
+                                  '/mnt/extsdcard/',
+                                  '/storage/sdcard/',
+                                  '/storage/sdcard0/',
+                                  '/storage/sdcard1/'])
         for path in storage_paths:
             if self.device.file_manager.dir_exists(path):
-                self.device.file_manager.remove(path + '/*')
+                for item in self.device.file_manager.list_items(path):
+                    self.device.file_manager.remove('/'.join([path, item]))
 
     def cleanup_gaia(self, full_reset=True):