ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-01 10:46:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct harmless indentation errors found by pylint

Browse Source
This commit is contained in:
david-sarah 2010-02-25 23:21:51 -07:00
parent e76092e16c
commit a80f19a084
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/__init__.py
View File

@ -119,7 +119,7 @@ def get_linux_distro():
if _distname and _version: if _distname and _version:
return (_distname, _version) return (_distname, _version)
except EnvironmentError: except EnvironmentError:
pass pass
(_distname, _version) = platform.dist()[:2] (_distname, _version) = platform.dist()[:2]
if _distname and _version: if _distname and _version:

38
src/allmydata/test/common.py
View File

@ -79,16 +79,16 @@ class FakeCHKFileNode:
data["count-recoverable-versions"] = 1 data["count-recoverable-versions"] = 1
data["count-unrecoverable-versions"] = 0 data["count-unrecoverable-versions"] = 0
if is_bad: if is_bad:
r.set_healthy(False) r.set_healthy(False)
r.set_recoverable(True) r.set_recoverable(True)
data["count-shares-good"] = 9 data["count-shares-good"] = 9
data["list-corrupt-shares"] = [(nodeid, self.storage_index, 0)] data["list-corrupt-shares"] = [(nodeid, self.storage_index, 0)]
r.problems = failure.Failure(CorruptShareError(is_bad)) r.problems = failure.Failure(CorruptShareError(is_bad))
else: else:
r.set_healthy(True) r.set_healthy(True)
r.set_recoverable(True) r.set_recoverable(True)
data["count-shares-good"] = 10 data["count-shares-good"] = 10
r.problems = [] r.problems = []
r.set_data(data) r.set_data(data)
r.set_needs_rebalancing(False) r.set_needs_rebalancing(False)
return defer.succeed(r) return defer.succeed(r)
@ -250,17 +250,17 @@ class FakeMutableFileNode:
data["count-recoverable-versions"] = 1 data["count-recoverable-versions"] = 1
data["count-unrecoverable-versions"] = 0 data["count-unrecoverable-versions"] = 0
if is_bad: if is_bad:
r.set_healthy(False) r.set_healthy(False)
r.set_recoverable(True) r.set_recoverable(True)
data["count-shares-good"] = 9 data["count-shares-good"] = 9
r.problems = failure.Failure(CorruptShareError("peerid", r.problems = failure.Failure(CorruptShareError("peerid",
0, # shnum 0, # shnum
is_bad)) is_bad))
else: else:
r.set_healthy(True) r.set_healthy(True)
r.set_recoverable(True) r.set_recoverable(True)
data["count-shares-good"] = 10 data["count-shares-good"] = 10
r.problems = [] r.problems = []
r.set_data(data) r.set_data(data)
r.set_needs_rebalancing(False) r.set_needs_rebalancing(False)
return defer.succeed(r) return defer.succeed(r)

26
src/allmydata/test/test_hung_server.py
View File

@ -51,19 +51,19 @@ class HungServerDownloadTest(GridTestMixin, ShouldFailMixin, unittest.TestCase):
self._copy_share((i_shnum, i_sharefile), to_server) self._copy_share((i_shnum, i_sharefile), to_server)
def _copy_share(self, share, to_server): def _copy_share(self, share, to_server):
(sharenum, sharefile) = share (sharenum, sharefile) = share
(id, ss) = to_server (id, ss) = to_server
shares_dir = os.path.join(ss.original.storedir, "shares") shares_dir = os.path.join(ss.original.storedir, "shares")
si = uri.from_string(self.uri).get_storage_index() si = uri.from_string(self.uri).get_storage_index()
si_dir = os.path.join(shares_dir, storage_index_to_dir(si)) si_dir = os.path.join(shares_dir, storage_index_to_dir(si))
if not os.path.exists(si_dir): if not os.path.exists(si_dir):
os.makedirs(si_dir) os.makedirs(si_dir)
new_sharefile = os.path.join(si_dir, str(sharenum)) new_sharefile = os.path.join(si_dir, str(sharenum))
shutil.copy(sharefile, new_sharefile) shutil.copy(sharefile, new_sharefile)
self.shares = self.find_shares(self.uri) self.shares = self.find_shares(self.uri)
# Make sure that the storage server has the share. # Make sure that the storage server has the share.
self.failUnless((sharenum, ss.original.my_nodeid, new_sharefile) self.failUnless((sharenum, ss.original.my_nodeid, new_sharefile)
in self.shares) in self.shares)
def _corrupt_share(self, share, corruptor_func): def _corrupt_share(self, share, corruptor_func):
(sharenum, sharefile) = share (sharenum, sharefile) = share

16
src/allmydata/test/test_uri.py
View File

@ -231,14 +231,14 @@ class Unknown(unittest.TestCase):
class Constraint(unittest.TestCase): class Constraint(unittest.TestCase):
def test_constraint(self): def test_constraint(self):
good="http://127.0.0.1:3456/uri/URI%3ADIR2%3Agh3l5rbvnv2333mrfvalmjfr4i%3Alz6l7u3z3b7g37s4zkdmfpx5ly4ib4m6thrpbusi6ys62qtc6mma/" good="http://127.0.0.1:3456/uri/URI%3ADIR2%3Agh3l5rbvnv2333mrfvalmjfr4i%3Alz6l7u3z3b7g37s4zkdmfpx5ly4ib4m6thrpbusi6ys62qtc6mma/"
uri.DirectoryURI.init_from_human_encoding(good) uri.DirectoryURI.init_from_human_encoding(good)
self.failUnlessRaises(uri.BadURIError, uri.DirectoryURI.init_from_string, good) self.failUnlessRaises(uri.BadURIError, uri.DirectoryURI.init_from_string, good)
bad = good + '===' bad = good + '==='
self.failUnlessRaises(uri.BadURIError, uri.DirectoryURI.init_from_human_encoding, bad) self.failUnlessRaises(uri.BadURIError, uri.DirectoryURI.init_from_human_encoding, bad)
self.failUnlessRaises(uri.BadURIError, uri.DirectoryURI.init_from_string, bad) self.failUnlessRaises(uri.BadURIError, uri.DirectoryURI.init_from_string, bad)
fileURI = 'URI:CHK:gh3l5rbvnv2333mrfvalmjfr4i:lz6l7u3z3b7g37s4zkdmfpx5ly4ib4m6thrpbusi6ys62qtc6mma:3:10:345834' fileURI = 'URI:CHK:gh3l5rbvnv2333mrfvalmjfr4i:lz6l7u3z3b7g37s4zkdmfpx5ly4ib4m6thrpbusi6ys62qtc6mma:3:10:345834'
uri.CHKFileURI.init_from_string(fileURI) uri.CHKFileURI.init_from_string(fileURI)
class Mutable(unittest.TestCase): class Mutable(unittest.TestCase):
def test_pack(self): def test_pack(self):