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

Replace "UploadHappinessError" with "UploadUnhappinessError" in tests.

Browse Source
This commit is contained in:
Kevan Carstensen 2009-12-04 22:34:53 -07:00
parent c0f3dbb919
commit 953c9555ca
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/test/test_encode.py
View File

@ -9,7 +9,7 @@ from allmydata.util import hashutil
from allmydata.util.assertutil import _assert
from allmydata.util.consumer import MemoryConsumer
from allmydata.interfaces import IStorageBucketWriter, IStorageBucketReader, \
NotEnoughSharesError, IStorageBroker, UploadHappinessError
NotEnoughSharesError, IStorageBroker, UploadUnhappinessError
from allmydata.monitor import Monitor
import common_util as testutil
@ -791,7 +791,7 @@ class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin):
d = self.send_and_recover((4,8,10), bucket_modes=modemap)
def _done(res):
self.failUnless(isinstance(res, Failure))
self.failUnless(res.check(UploadHappinessError), res)
self.failUnless(res.check(UploadUnhappinessError), res)
d.addBoth(_done)
return d
@ -802,6 +802,6 @@ class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin):
d = self.send_and_recover((4,8,10), bucket_modes=modemap)
def _done(res):
self.failUnless(isinstance(res, Failure))
self.failUnless(res.check(UploadHappinessError))
self.failUnless(res.check(UploadUnhappinessError))
d.addBoth(_done)
return d

22
src/allmydata/test/test_upload.py
View File

@ -10,7 +10,7 @@ from foolscap.api import fireEventually
import allmydata # for __full_version__
from allmydata import uri, monitor, client
from allmydata.immutable import upload, encode
from allmydata.interfaces import FileTooLargeError, UploadHappinessError
from allmydata.interfaces import FileTooLargeError, UploadUnhappinessError
from allmydata.util.assertutil import precondition
from allmydata.util.deferredutil import DeferredListShouldSucceed
from no_network import GridTestMixin
@ -399,7 +399,7 @@ class ServerErrors(unittest.TestCase, ShouldFailMixin, SetDEPMixin):
def test_first_error_all(self):
self.make_node("first-fail")
d = self.shouldFail(UploadHappinessError, "first_error_all",
d = self.shouldFail(UploadUnhappinessError, "first_error_all",
"peer selection failed",
upload_data, self.u, DATA)
def _check((f,)):
@ -431,7 +431,7 @@ class ServerErrors(unittest.TestCase, ShouldFailMixin, SetDEPMixin):
def test_second_error_all(self):
self.make_node("second-fail")
d = self.shouldFail(UploadHappinessError, "second_error_all",
d = self.shouldFail(UploadUnhappinessError, "second_error_all",
"peer selection failed",
upload_data, self.u, DATA)
def _check((f,)):
@ -449,7 +449,7 @@ class FullServer(unittest.TestCase):
self.u.parent = self.node
def _should_fail(self, f):
self.failUnless(isinstance(f, Failure) and f.check(UploadHappinessError), f)
self.failUnless(isinstance(f, Failure) and f.check(UploadUnhappinessError), f)
def test_data_large(self):
data = DATA
@ -814,7 +814,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
# These parameters are unsatisfiable with the client that we've made
# -- we'll use them to test that the semnatics work correctly.
self.set_encoding_parameters(k=3, happy=5, n=10)
d = self.shouldFail(UploadHappinessError, "test_happy_semantics",
d = self.shouldFail(UploadUnhappinessError, "test_happy_semantics",
"shares could only be placed on 2 servers "
"(5 were requested)",
self.u.upload, DATA)
@ -885,7 +885,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
_prepare())
# Uploading data should fail
d.addCallback(lambda client:
self.shouldFail(UploadHappinessError, "test_happy_semantics",
self.shouldFail(UploadUnhappinessError, "test_happy_semantics",
"shares could only be placed on 2 servers "
"(4 were requested)",
client.upload, upload.Data("data" * 10000,
@ -915,7 +915,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
d.addCallback(lambda ign:
_prepare2())
d.addCallback(lambda client:
self.shouldFail(UploadHappinessError, "test_happy_sematics",
self.shouldFail(UploadUnhappinessError, "test_happy_sematics",
"shares could only be placed on 2 servers "
"(3 were requested)",
client.upload, upload.Data("data" * 10000,
@ -1121,7 +1121,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
d.addCallback(_do_server_setup)
d.addCallback(_remove_server)
d.addCallback(lambda ign:
self.shouldFail(UploadHappinessError,
self.shouldFail(UploadUnhappinessError,
"test_dropped_servers_in_encoder",
"lost too many servers during upload "
"(still have 3, want 4)",
@ -1148,7 +1148,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
d.addCallback(_do_server_setup_2)
d.addCallback(_remove_server)
d.addCallback(lambda ign:
self.shouldFail(UploadHappinessError,
self.shouldFail(UploadUnhappinessError,
"test_dropped_servers_in_encoder",
"lost too many servers during upload "
"(still have 3, want 4)",
@ -1300,7 +1300,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
return client
d.addCallback(_reset_encoding_parameters)
d.addCallback(lambda client:
self.shouldFail(UploadHappinessError, "test_selection_exceptions",
self.shouldFail(UploadUnhappinessError, "test_selection_exceptions",
"peer selection failed for <Tahoe2PeerSelector "
"for upload dglev>: placed 0 shares out of 10 "
"total (10 homeless), want to place on 4 servers,"
@ -1347,7 +1347,7 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin,
return client
d.addCallback(_reset_encoding_parameters)
d.addCallback(lambda client:
self.shouldFail(UploadHappinessError, "test_selection_exceptions",
self.shouldFail(UploadUnhappinessError, "test_selection_exceptions",
"peer selection failed for <Tahoe2PeerSelector "
"for upload dglev>: placed 0 shares out of 10 "
"total (10 homeless), want to place on 4 servers,"