Merge lp:~mandel/ubuntuone-client/fix-803622 into lp:ubuntuone-client

[Manuel de la Peña]

Ensure that we use the correct mode when opening files: r+w is an illegal mode everywhere, and has been changed to w+b to ensure that it works on all platforms (LP: #803622).

Ensure that we use the correct mode. r+w is an illegal mode verywhere and has been changed to w+b to ensure that it will work on all platforms.

In order to run the tests on windows please do:

python C:\Python27\Scripts\u1trial tests\syncdaemon\test_action_queue.py -t test_fdopen

[Natalia Bidart (nataliabidart)]

Test needed! :-)

review: Needs Fixing

[lp:~mandel/ubuntuone-client/fix-803622]

1033. By Manuel de la Peña on 2011-06-30

Added test to ensure we use the correct mode.

1034. By Manuel de la Peña on 2011-06-30

Merged with changes form linux.

1035. By Manuel de la Peña on 2011-06-30

Added real test to ensure that we can read and write.

[Guillermo Gonzalez (verterok)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

== Python Lint Notices ==

./tests/syncdaemon/test_action_queue.py:
    5653: local variable 'tmp' is assigned to but never used

review: Needs Fixing

[lp:~mandel/ubuntuone-client/fix-803622]

1036. By Manuel de la Peña on 2011-06-30

Remove unused var.

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2011-05-31 15:23:02 +0000
+++ tests/syncdaemon/test_action_queue.py	2011-06-30 15:03:26 +0000
@@ -33,7 +33,7 @@
 
 from functools import wraps
 
-from mocker import Mocker
+from mocker import Mocker, MockerTestCase, ANY
 from StringIO import StringIO
 from oauth import oauth
 from twisted.internet import defer, threads, reactor
@@ -65,6 +65,7 @@
     TRANSFER_PROGRESS_THRESHOLD, Unlink, Move, MakeFile, MakeDir, DeltaList,
     ZipQueue, DeferredMap, ThrottlingStorageClient, PathLockingTree,
     InterruptibleDeferred, DeferredInterrupted, ConditionsLocker,
+    NamedTemporaryFile
 )
 from ubuntuone.syncdaemon.event_queue import EventQueue, EVENTS
 from ubuntuone.syncdaemon.marker import MDMarker
@@ -5634,3 +5635,29 @@
         # 1 should be released, 2 should not (even with conditions ok)
         self.assertTrue(locking_d1.called)
         self.assertFalse(locking_d2.called)
+
+
+class OsIntegrationTests(BasicTestCase, MockerTestCase):
+    """Ensure that the correct os_helper methods are used."""
+
+    def setUp(self):
+        """Set up for tests."""
+        super(OsIntegrationTests, self).setUp()
+        self.fdopen = self.mocker.replace('os.fdopen')
+
+    def test_fdopen(self):
+        """Ensure that we are calling fdopen correctly."""
+        # set expectations
+        self.fdopen(ANY, 'w+b')
+        self.mocker.replay()
+        NamedTemporaryFile()
+
+    def test_fdopen_real(self):
+        """Do test that the NamedTeporaryFile can read and write."""
+        data = 'test'
+        self.mocker.replay()
+        tmp = NamedTemporaryFile()
+        tmp.write(data)
+        tmp.seek(0)
+        self.assertEqual(data, tmp.read(len(data)))
+        tmp.close()
\ No newline at end of file

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2011-05-31 15:23:02 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2011-06-30 15:03:26 +0000
@@ -230,7 +230,7 @@
 
     def __init__(self):
         fileno, self.name = tempfile.mkstemp()
-        self._fd = os.fdopen(fileno, 'r+w')
+        self._fd = os.fdopen(fileno, 'w+b')
 
     def __getattr__(self, attr):
         """Proxy everything else (other than .name) on to self._fd."""