Merge lp:~nataliabidart/ubuntuone-storage-protocol/test-failing-stable-1-6 into lp:ubuntuone-storage-protocol/stable-1-6

[Natalia Bidart]

- Fixed tests calls to super() (LP: #890277).

[Manuel de la Peña (mandel)]

Looks good.

review: Approve

=== modified file 'tests/test_bytesproducer.py'
--- tests/test_bytesproducer.py	2011-04-25 21:00:47 +0000
+++ tests/test_bytesproducer.py	2011-11-14 16:43:41 +0000
@@ -23,7 +23,7 @@
 from unittest import TestCase
 from cStringIO import StringIO
 
-from twisted.internet import task
+from twisted.internet import defer, task
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
 from ubuntuone.storageprotocol import client, protocol_pb2
@@ -94,7 +94,9 @@
 
     timeout = 1
 
+    @defer.inlineCallbacks
     def setUp(self):
+        yield super(TestGenerateData, self).setUp()
         fh = StringIO()
         fh.write("abcde")
         fh.seek(0)

=== modified file 'tests/test_request.py'
--- tests/test_request.py	2010-11-04 14:18:06 +0000
+++ tests/test_request.py	2011-11-14 16:43:41 +0000
@@ -23,9 +23,9 @@
 
 import uuid
 
+from twisted.internet import defer
+from twisted.python.failure import Failure
 from twisted.trial.unittest import TestCase as TwistedTestCase
-from twisted.internet.defer import inlineCallbacks
-from twisted.python.failure import Failure
 
 from ubuntuone.storageprotocol import errors, protocol_pb2
 from ubuntuone.storageprotocol.request import (
@@ -72,20 +72,16 @@
 
     timeout = 2
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Init."""
+        yield super(TestRequest, self).setUp()
         transport = ConnectionLike()
         protocol = RequestHandler()
         protocol.makeConnection(transport)
         self.request = MindlessRequest(protocol=protocol)
         self.error = None
 
-    def tearDown(self):
-        """Clean up."""
-        self.error = None
-        self.request = None
-
-    @inlineCallbacks
+    @defer.inlineCallbacks
     def test_disconnect_aborts_requests(self):
         """Test that disconnection aborts outstanding requests."""
 
@@ -176,8 +172,9 @@
 class TestRequestResponse(TestRequest):
     """Tests for RequestResponse."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Init."""
+        yield super(TestRequestResponse, self).setUp()
         message = protocol_pb2.Message()
         message.id = 1
         transport = ConnectionLike()

=== modified file 'tests/test_sharersp.py'
--- tests/test_sharersp.py	2010-09-16 14:59:29 +0000
+++ tests/test_sharersp.py	2011-11-14 16:43:41 +0000
@@ -19,7 +19,9 @@
 
 import uuid
 
+from twisted.internet import defer
 from twisted.trial.unittest import TestCase
+
 from ubuntuone.storageprotocol.sharersp import ShareResponse
 from ubuntuone.storageprotocol import protocol_pb2
 
@@ -88,8 +90,9 @@
 
     access_level = 'View'
 
+    @defer.inlineCallbacks
     def setUp(self):
-        """Setup."""
+        yield super(ShareResponseFromToMsgTest, self).setUp()
         self.msg = protocol_pb2.Message()
         self.msg.type = protocol_pb2.Message.SHARES_INFO
 

=== modified file 'tests/test_throttling.py'
--- tests/test_throttling.py	2010-11-04 14:18:06 +0000
+++ tests/test_throttling.py	2011-11-14 16:43:41 +0000
@@ -20,7 +20,7 @@
 
 from __future__ import with_statement
 
-from twisted.internet import task
+from twisted.internet import defer, task
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
 from ubuntuone.storageprotocol import client
@@ -52,18 +52,14 @@
 class BaseThrottlingTestCase(TwistedTestCase):
     """Base test case for ThrottlingStorageClientFactory."""
 
+    @defer.inlineCallbacks
     def setUp(self):
+        yield super(BaseThrottlingTestCase, self).setUp()
         self.client = FakeClient()
         self.factories = []
         self.clock = task.Clock()
-        # use our custom clock instead of the reactor for the callLater
-        self.old_callLater = client.ThrottlingStorageClientFactory.callLater
-        client.ThrottlingStorageClientFactory.callLater = self.clock.callLater
-
-    def tearDown(self):
-        for f in self.factories:
-            f.unregisterProtocol(None)
-        client.ThrottlingStorageClientFactory.callLater = self.old_callLater
+        self.patch(client.ThrottlingStorageClientFactory, 'callLater',
+                   self.clock.callLater)
 
     def create_factory(self, enabled, read_limit, write_limit):
         """Create a ThrottlingStorageClientFactory with the specified args."""
@@ -71,6 +67,7 @@
                                                      write_limit)
         tscf.client = self.client
         self.factories.append(tscf)
+        self.addCleanup(self.destroy_factory, tscf)
         return tscf
 
     def destroy_factory(self, factory):
@@ -82,8 +79,9 @@
 class TestProducingState(BaseThrottlingTestCase):
     """Tests for 'producing' state with different limit values."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        BaseThrottlingTestCase.setUp(self)
+        yield super(TestProducingState, self).setUp()
         self.tscf = self.create_factory(True, 3, 3)
 
     def test_under_write_limit(self):