Ubuntu One storage protocol

Merge lp:~nataliabidart/ubuntuone-storage-protocol/test-failing-stable-2-0 into lp:ubuntuone-storage-protocol/stable-2-0

  1. test-failing-stable-2-0
  2. Merge into stable-2-0
Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 141
Merged at revision: 140
Proposed branch: lp:~nataliabidart/ubuntuone-storage-protocol/test-failing-stable-2-0
Merge into: lp:ubuntuone-storage-protocol/stable-2-0
Diff against target: 269 lines (+33/-48)
5 files modified
tests/test_bytesproducer.py (+3/-1)
tests/test_client.py (+11/-26)
tests/test_request.py (+7/-10)
tests/test_sharersp.py (+4/-1)
tests/test_throttling.py (+8/-10)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-storage-protocol/test-failing-stable-2-0
Reviewer Review Type Date Requested Status
dobey (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+82191@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) wrote :

Looks good.

review: Approve
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/test_bytesproducer.py'
--- tests/test_bytesproducer.py 2011-04-20 18:49:55 +0000
+++ tests/test_bytesproducer.py 2011-11-14 16:43:42 +0000
@@ -23,7 +23,7 @@
23from unittest import TestCase23from unittest import TestCase
24from cStringIO import StringIO24from cStringIO import StringIO
2525
26from twisted.internet import task26from twisted.internet import defer, task
27from twisted.trial.unittest import TestCase as TwistedTestCase27from twisted.trial.unittest import TestCase as TwistedTestCase
2828
29from ubuntuone.storageprotocol import client, protocol_pb229from ubuntuone.storageprotocol import client, protocol_pb2
@@ -94,7 +94,9 @@
9494
95 timeout = 195 timeout = 1
9696
97 @defer.inlineCallbacks
97 def setUp(self):98 def setUp(self):
99 yield super(TestGenerateData, self).setUp()
98 fh = StringIO()100 fh = StringIO()
99 fh.write("abcde")101 fh.write("abcde")
100 fh.seek(0)102 fh.seek(0)
101103
=== modified file 'tests/test_client.py'
--- tests/test_client.py 2011-07-29 21:52:42 +0000
+++ tests/test_client.py 2011-11-14 16:43:42 +0000
@@ -23,6 +23,7 @@
23import unittest23import unittest
24import uuid24import uuid
2525
26from twisted.internet import defer
26from twisted.internet.defer import Deferred27from twisted.internet.defer import Deferred
27from twisted.trial.unittest import TestCase as TwistedTestCase28from twisted.trial.unittest import TestCase as TwistedTestCase
2829
@@ -464,8 +465,9 @@
464465
465 request_class = request.Request466 request_class = request.Request
466467
468 @defer.inlineCallbacks
467 def setUp(self):469 def setUp(self):
468 """Initialize testing protocol."""470 yield super(RequestTestCase, self).setUp()
469 import types471 import types
470 self.request_class = types.ClassType(self.request_class.__name__,472 self.request_class = types.ClassType(self.request_class.__name__,
471 (self.request_class,), {})473 (self.request_class,), {})
@@ -476,21 +478,16 @@
476478
477 request_class = CreateUDF479 request_class = CreateUDF
478480
481 @defer.inlineCallbacks
479 def setUp(self):482 def setUp(self):
480 """Initialize testing protocol."""483 """Initialize testing protocol."""
481 super(CreateUDFTestCase, self).setUp()484 yield super(CreateUDFTestCase, self).setUp()
482 self.protocol = FakedProtocol()485 self.protocol = FakedProtocol()
483 self.request = self.request_class(self.protocol, path=PATH, name=NAME)486 self.request = self.request_class(self.protocol, path=PATH, name=NAME)
484 self.request.error = faked_error487 self.request.error = faked_error
485 self.done_called = False488 self.done_called = False
486 self.request.done = was_called(self, 'done_called')489 self.request.done = was_called(self, 'done_called')
487490
488 def tearDown(self):
489 """Clean up."""
490 self.protocol = None
491 self.request = None
492 super(CreateUDFTestCase, self).tearDown()
493
494 def test_init(self):491 def test_init(self):
495 """Test request creation."""492 """Test request creation."""
496 self.assertEquals(PATH, self.request.path)493 self.assertEquals(PATH, self.request.path)
@@ -532,20 +529,16 @@
532529
533 request_class = ListVolumes530 request_class = ListVolumes
534531
532 @defer.inlineCallbacks
535 def setUp(self):533 def setUp(self):
536 """Initialize testing protocol."""534 """Initialize testing protocol."""
537 super(ListVolumesTestCase, self).setUp()535 yield super(ListVolumesTestCase, self).setUp()
538 self.protocol = FakedProtocol()536 self.protocol = FakedProtocol()
539 self.request = self.request_class(self.protocol)537 self.request = self.request_class(self.protocol)
540 self.request.error = faked_error538 self.request.error = faked_error
541 self.done_called = False539 self.done_called = False
542 self.request.done = was_called(self, 'done_called')540 self.request.done = was_called(self, 'done_called')
543541
544 def tearDown(self):
545 """Clean up."""
546 self.protocol = None
547 self.request = None
548
549 def test_init(self):542 def test_init(self):
550 """Test request creation."""543 """Test request creation."""
551 self.assertEquals([], self.request.volumes)544 self.assertEquals([], self.request.volumes)
@@ -618,20 +611,16 @@
618611
619 request_class = DeleteVolume612 request_class = DeleteVolume
620613
614 @defer.inlineCallbacks
621 def setUp(self):615 def setUp(self):
622 """Initialize testing protocol."""616 """Initialize testing protocol."""
623 super(DeleteVolumeTestCase, self).setUp()617 yield super(DeleteVolumeTestCase, self).setUp()
624 self.protocol = FakedProtocol()618 self.protocol = FakedProtocol()
625 self.request = self.request_class(self.protocol, volume_id=VOLUME)619 self.request = self.request_class(self.protocol, volume_id=VOLUME)
626 self.request.error = faked_error620 self.request.error = faked_error
627 self.done_called = False621 self.done_called = False
628 self.request.done = was_called(self, 'done_called')622 self.request.done = was_called(self, 'done_called')
629623
630 def tearDown(self):
631 """Clean up."""
632 self.protocol = None
633 self.request = None
634
635 def test_init(self):624 def test_init(self):
636 """Test request creation."""625 """Test request creation."""
637 self.assertEquals(str(VOLUME), self.request.volume_id)626 self.assertEquals(str(VOLUME), self.request.volume_id)
@@ -665,20 +654,16 @@
665654
666 request_class = GetDelta655 request_class = GetDelta
667656
657 @defer.inlineCallbacks
668 def setUp(self):658 def setUp(self):
669 """Initialize testing protocol."""659 """Initialize testing protocol."""
670 super(GetDeltaTestCase, self).setUp()660 yield super(GetDeltaTestCase, self).setUp()
671 self.protocol = FakedProtocol()661 self.protocol = FakedProtocol()
672 self.request = self.request_class(self.protocol, SHARE, 0)662 self.request = self.request_class(self.protocol, SHARE, 0)
673 self.request.error = faked_error663 self.request.error = faked_error
674 self.done_called = False664 self.done_called = False
675 self.request.done = was_called(self, 'done_called')665 self.request.done = was_called(self, 'done_called')
676666
677 def tearDown(self):
678 """Clean up."""
679 self.protocol = None
680 self.request = None
681
682 def test_init(self):667 def test_init(self):
683 """Test request creation."""668 """Test request creation."""
684 self.assertEquals(str(SHARE), self.request.share_id)669 self.assertEquals(str(SHARE), self.request.share_id)
685670
=== 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:42 +0000
@@ -23,9 +23,9 @@
2323
24import uuid24import uuid
2525
26from twisted.internet import defer
27from twisted.python.failure import Failure
26from twisted.trial.unittest import TestCase as TwistedTestCase28from twisted.trial.unittest import TestCase as TwistedTestCase
27from twisted.internet.defer import inlineCallbacks
28from twisted.python.failure import Failure
2929
30from ubuntuone.storageprotocol import errors, protocol_pb230from ubuntuone.storageprotocol import errors, protocol_pb2
31from ubuntuone.storageprotocol.request import (31from ubuntuone.storageprotocol.request import (
@@ -72,20 +72,16 @@
7272
73 timeout = 273 timeout = 2
7474
75 @defer.inlineCallbacks
75 def setUp(self):76 def setUp(self):
76 """Init."""77 yield super(TestRequest, self).setUp()
77 transport = ConnectionLike()78 transport = ConnectionLike()
78 protocol = RequestHandler()79 protocol = RequestHandler()
79 protocol.makeConnection(transport)80 protocol.makeConnection(transport)
80 self.request = MindlessRequest(protocol=protocol)81 self.request = MindlessRequest(protocol=protocol)
81 self.error = None82 self.error = None
8283
83 def tearDown(self):84 @defer.inlineCallbacks
84 """Clean up."""
85 self.error = None
86 self.request = None
87
88 @inlineCallbacks
89 def test_disconnect_aborts_requests(self):85 def test_disconnect_aborts_requests(self):
90 """Test that disconnection aborts outstanding requests."""86 """Test that disconnection aborts outstanding requests."""
9187
@@ -176,8 +172,9 @@
176class TestRequestResponse(TestRequest):172class TestRequestResponse(TestRequest):
177 """Tests for RequestResponse."""173 """Tests for RequestResponse."""
178174
175 @defer.inlineCallbacks
179 def setUp(self):176 def setUp(self):
180 """Init."""177 yield super(TestRequestResponse, self).setUp()
181 message = protocol_pb2.Message()178 message = protocol_pb2.Message()
182 message.id = 1179 message.id = 1
183 transport = ConnectionLike()180 transport = ConnectionLike()
184181
=== 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:42 +0000
@@ -19,7 +19,9 @@
1919
20import uuid20import uuid
2121
22from twisted.internet import defer
22from twisted.trial.unittest import TestCase23from twisted.trial.unittest import TestCase
24
23from ubuntuone.storageprotocol.sharersp import ShareResponse25from ubuntuone.storageprotocol.sharersp import ShareResponse
24from ubuntuone.storageprotocol import protocol_pb226from ubuntuone.storageprotocol import protocol_pb2
2527
@@ -88,8 +90,9 @@
8890
89 access_level = 'View'91 access_level = 'View'
9092
93 @defer.inlineCallbacks
91 def setUp(self):94 def setUp(self):
92 """Setup."""95 yield super(ShareResponseFromToMsgTest, self).setUp()
93 self.msg = protocol_pb2.Message()96 self.msg = protocol_pb2.Message()
94 self.msg.type = protocol_pb2.Message.SHARES_INFO97 self.msg.type = protocol_pb2.Message.SHARES_INFO
9598
9699
=== 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:42 +0000
@@ -20,7 +20,7 @@
2020
21from __future__ import with_statement21from __future__ import with_statement
2222
23from twisted.internet import task23from twisted.internet import defer, task
24from twisted.trial.unittest import TestCase as TwistedTestCase24from twisted.trial.unittest import TestCase as TwistedTestCase
2525
26from ubuntuone.storageprotocol import client26from ubuntuone.storageprotocol import client
@@ -52,18 +52,14 @@
52class BaseThrottlingTestCase(TwistedTestCase):52class BaseThrottlingTestCase(TwistedTestCase):
53 """Base test case for ThrottlingStorageClientFactory."""53 """Base test case for ThrottlingStorageClientFactory."""
5454
55 @defer.inlineCallbacks
55 def setUp(self):56 def setUp(self):
57 yield super(BaseThrottlingTestCase, self).setUp()
56 self.client = FakeClient()58 self.client = FakeClient()
57 self.factories = []59 self.factories = []
58 self.clock = task.Clock()60 self.clock = task.Clock()
59 # use our custom clock instead of the reactor for the callLater61 self.patch(client.ThrottlingStorageClientFactory, 'callLater',
60 self.old_callLater = client.ThrottlingStorageClientFactory.callLater62 self.clock.callLater)
61 client.ThrottlingStorageClientFactory.callLater = self.clock.callLater
62
63 def tearDown(self):
64 for f in self.factories:
65 f.unregisterProtocol(None)
66 client.ThrottlingStorageClientFactory.callLater = self.old_callLater
6763
68 def create_factory(self, enabled, read_limit, write_limit):64 def create_factory(self, enabled, read_limit, write_limit):
69 """Create a ThrottlingStorageClientFactory with the specified args."""65 """Create a ThrottlingStorageClientFactory with the specified args."""
@@ -71,6 +67,7 @@
71 write_limit)67 write_limit)
72 tscf.client = self.client68 tscf.client = self.client
73 self.factories.append(tscf)69 self.factories.append(tscf)
70 self.addCleanup(self.destroy_factory, tscf)
74 return tscf71 return tscf
7572
76 def destroy_factory(self, factory):73 def destroy_factory(self, factory):
@@ -82,8 +79,9 @@
82class TestProducingState(BaseThrottlingTestCase):79class TestProducingState(BaseThrottlingTestCase):
83 """Tests for 'producing' state with different limit values."""80 """Tests for 'producing' state with different limit values."""
8481
82 @defer.inlineCallbacks
85 def setUp(self):83 def setUp(self):
86 BaseThrottlingTestCase.setUp(self)84 yield super(TestProducingState, self).setUp()
87 self.tscf = self.create_factory(True, 3, 3)85 self.tscf = self.create_factory(True, 3, 3)
8886
89 def test_under_write_limit(self):87 def test_under_write_limit(self):

Subscribers

People subscribed via source and target branches