Merge lp:~brian.curtin/ubuntuone-control-panel/share-links-windows-corrections into lp:ubuntuone-control-panel

[Brian Curtin]

- Use os.path.join to construct platform-safe paths in share links tests

Change some manually built path strings to use os.path.join to create correct paths when run on Windows. Currently the test suite is failing on Windows because of this.

[lp:~brian.curtin/ubuntuone-control-panel/share-links-windows-corrections]

354. By Brian Curtin on 2012-09-24

forgot to break line

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-09-14 20:23:13 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-09-24 17:59:20 +0000
@@ -163,12 +163,12 @@
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
         expected = [
-            'other_path/test/qwe',
-            '~/blabla/iop',
-            '~/one/file3',
-            '~/test/asd',
-            '~/ubuntu/file1',
-            '~/ubuntu/file2']
+            os.path.join('other_path', 'test', 'qwe'),
+            os.path.join('~', 'blabla', 'iop'),
+            os.path.join('~', 'one', 'file3'),
+            os.path.join('~', 'test', 'asd'),
+            os.path.join('~', 'ubuntu', 'file1'),
+            os.path.join('~', 'ubuntu', 'file2')]
         self.assertEqual(self.ui._thread_explore.u1_files, expected)
         self.assertEqual(self.ui.popup.list_widget.count(), 6)
 
@@ -183,15 +183,15 @@
         data2 = [{'realpath': 'folder2'}]
         self.ui._process_volumes_info([(0, 0, data1), (0, 0, data2)])
         self.ui.filter('p')
-        expected = ['~/blabla/iop']
+        expected = [os.path.join('~', 'blabla', 'iop')]
         self.assertEqual(expected, self.ui.temp_u1_files)
 
         self.ui.filter('i')
         expected = [
-            '~/blabla/iop',
-            '~/one/file3',
-            '~/ubuntu/file1',
-            '~/ubuntu/file2']
+            os.path.join('~', 'blabla', 'iop'),
+            os.path.join('~', 'one', 'file3'),
+            os.path.join('~', 'ubuntu', 'file1'),
+            os.path.join('~', 'ubuntu', 'file2')]
         self.assertEqual(expected, self.ui.temp_u1_files)
 
     def test_set_selected_item(self):
@@ -204,7 +204,8 @@
         self.ui.popup.list_widget.setCurrentRow(0)
         item = self.ui.popup.list_widget.currentItem()
         self.ui._set_selected_item(item)
-        self.assertEqual(self._called, ((u'other_path/test/qwe',), {}))
+        self.assertEqual(self._called,
+                ((os.path.join(u'other_path', u'test', u'qwe'),), {}))
         self.assertEqual(self.ui.text(), '')