ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-22 00:41:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_dirnode.py: convert Deleter to new no-network gridtest

Browse Source
This commit is contained in:
Brian Warner
2009-02-16 17:23:48 -07:00
parent 267d91f797
commit e9427ea777
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/allmydata/test/test_dirnode.py
View File

@ -14,7 +14,8 @@ from allmydata.mutable.common import UncoordinatedWriteError
from allmydata.util import hashutil, base32 from allmydata.util import hashutil, base32
from allmydata.monitor import Monitor from allmydata.monitor import Monitor
from allmydata.test.common import make_chk_file_uri, make_mutable_file_uri, \ from allmydata.test.common import make_chk_file_uri, make_mutable_file_uri, \
FakeDirectoryNode, create_chk_filenode, ErrorMixin, SystemTestMixin FakeDirectoryNode, create_chk_filenode, ErrorMixin
from allmydata.test.no_network import GridTestMixin
from allmydata.check_results import CheckResults, CheckAndRepairResults from allmydata.check_results import CheckResults, CheckAndRepairResults
import common_util as testutil import common_util as testutil
@ -786,7 +787,7 @@ class UCWEingNewDirectoryNode(dirnode.NewDirectoryNode):
filenode_class = UCWEingMutableFileNode filenode_class = UCWEingMutableFileNode
class Deleter(SystemTestMixin, unittest.TestCase): class Deleter(GridTestMixin, unittest.TestCase):
def test_retry(self): def test_retry(self):
# ticket #550, a dirnode.delete which experiences an # ticket #550, a dirnode.delete which experiences an
# UncoordinatedWriteError will fail with an incorrect "you're # UncoordinatedWriteError will fail with an incorrect "you're
@ -799,8 +800,9 @@ class Deleter(SystemTestMixin, unittest.TestCase):
# succeed. # succeed.
self.basedir = self.mktemp() self.basedir = self.mktemp()
d = self.set_up_nodes() self.set_up_grid()
d.addCallback(lambda ignored: self.clients[0].create_empty_dirnode()) c0 = self.g.clients[0]
d = c0.create_empty_dirnode()
small = upload.Data("Small enough for a LIT", None) small = upload.Data("Small enough for a LIT", None)
def _created_dir(dn): def _created_dir(dn):
self.root = dn self.root = dn
@ -808,7 +810,7 @@ class Deleter(SystemTestMixin, unittest.TestCase):
return dn.add_file(u"file", small) return dn.add_file(u"file", small)
d.addCallback(_created_dir) d.addCallback(_created_dir)
def _do_delete(ignored): def _do_delete(ignored):
n = UCWEingNewDirectoryNode(self.clients[0]).init_from_uri(self.root_uri) n = UCWEingNewDirectoryNode(c0).init_from_uri(self.root_uri)
assert n._node.please_ucwe_after_next_upload == False assert n._node.please_ucwe_after_next_upload == False
n._node.please_ucwe_after_next_upload = True n._node.please_ucwe_after_next_upload = True
# This should succeed, not raise an exception # This should succeed, not raise an exception