From: Brian Warner Date: Fri, 8 Feb 2008 03:15:37 +0000 (-0700) Subject: test_system: remove the hackish debug_interrupt= attribute magic used to exercise... X-Git-Tag: allmydata-tahoe-0.8.0~105 X-Git-Url: https://git.rkrishnan.org/about.html?a=commitdiff_plain;h=873dee53e98a48c7bc14f83fca5382d4532eac1f;p=tahoe-lafs%2Ftahoe-lafs.git test_system: remove the hackish debug_interrupt= attribute magic used to exercise interrupted-upload resumption, instead just make the Uploadable bounce the helper halfway through the upload --- diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py index 80fcb7f5..a50c3ba4 100644 --- a/src/allmydata/test/test_system.py +++ b/src/allmydata/test/test_system.py @@ -34,8 +34,15 @@ enough to not fit inside a LIT uri. class CountingDataUploadable(upload.Data): bytes_read = 0 + interrupt_after = None + interrupt_after_d = None + def read(self, length): self.bytes_read += length + if self.interrupt_after is not None: + if self.bytes_read > self.interrupt_after: + self.interrupt_after = None + self.interrupt_after_d.callback(self) return upload.Data.read(self, length) @@ -117,6 +124,17 @@ class SystemTest(testutil.SignalMixin, testutil.PollMixin, unittest.TestCase): d.addCallback(_connected) return d + def bounce_client(self, num): + c = self.clients[num] + d = c.disownServiceParent() + def _stopped(res): + new_c = client.Client(basedir=self.getdir("client%d" % num)) + self.clients[num] = new_c + self.add_service(new_c) + return new_c.when_tub_ready() + d.addCallback(_stopped) + return d + def add_extra_node(self, client_num, helper_furl=None, add_to_sparent=False): # usually this node is *not* parented to our self.sparent, so we can @@ -335,8 +353,12 @@ class SystemTest(testutil.SignalMixin, testutil.PollMixin, unittest.TestCase): u1 = CountingDataUploadable(DATA, contenthashkey=contenthashkey) u2 = CountingDataUploadable(DATA, contenthashkey=contenthashkey) - # tell the upload to drop the connection after about 5kB - u1.debug_interrupt = 5000 + # we interrupt the connection after about 5kB by shutting down + # the helper, then restartingit. + u1.interrupt_after = 5000 + u1.interrupt_after_d = defer.Deferred() + u1.interrupt_after_d.addCallback(lambda res: + self.bounce_client(0)) # sneak into the helper and reduce its chunk size, so that our # debug_interrupt will sever the connection on about the fifth @@ -372,7 +394,8 @@ class SystemTest(testutil.SignalMixin, testutil.PollMixin, unittest.TestCase): # could use fireEventually() to stall. Since we don't have # the right introduction hooks, the best we can do is use a # fixed delay. TODO: this is fragile. - return self.stall(None, 2.0) + u1.interrupt_after_d.addCallback(self.stall, 2.0) + return u1.interrupt_after_d d.addCallbacks(_should_not_finish, _interrupted) def _disconnected(res): diff --git a/src/allmydata/upload.py b/src/allmydata/upload.py index ebf21b18..2b150d0b 100644 --- a/src/allmydata/upload.py +++ b/src/allmydata/upload.py @@ -707,8 +707,6 @@ class RemoteEncryptedUploadable(Referenceable): self._eu = IEncryptedUploadable(encrypted_uploadable) self._offset = 0 self._bytes_sent = 0 - self._cutoff = None # set by debug options - self._cutoff_cb = None def remote_get_size(self): return self._eu.get_size() @@ -745,9 +743,6 @@ class RemoteEncryptedUploadable(Referenceable): def _at_correct_offset(res): assert offset == self._offset, "%d != %d" % (offset, self._offset) - if self._cutoff is not None and offset+length > self._cutoff: - self._cutoff_cb() - return self._read_encrypted(length, hash_only=False) d.addCallback(_at_correct_offset) @@ -836,19 +831,6 @@ class AssistedUploader: self.log("helper says we need to upload") # we need to upload the file reu = RemoteEncryptedUploadable(self._encuploadable) - - # we have unit tests which want to interrupt the upload so they - # can exercise resumability. They indicate this by adding debug_ - # attributes to the Uploadable. - if hasattr(self._encuploadable.original, "debug_interrupt"): - reu._cutoff = self._encuploadable.original.debug_interrupt - def _cutoff(): - # simulate the loss of the connection to the helper - self.log("debug_interrupt killing connection to helper", - level=log.WEIRD) - upload_helper.tracker.broker.transport.loseConnection() - return - reu._cutoff_cb = _cutoff d = upload_helper.callRemote("upload", reu) # this Deferred will fire with the upload results return d