From 9b1a78fedd97f21a43b486d04311012ca6078848 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 4 Aug 2015 20:08:35 +0100 Subject: [PATCH] test_upload.py: distinguish shouldFail checks for easier debugging. Signed-off-by: Daira Hopwood --- src/allmydata/test/test_upload.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py index f24d32c5..4b0497e4 100644 --- a/src/allmydata/test/test_upload.py +++ b/src/allmydata/test/test_upload.py @@ -1671,7 +1671,8 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin, return client d.addCallback(_reset_encoding_parameters) d.addCallback(lambda client: - self.shouldFail(UploadUnhappinessError, "test_selection_exceptions", + self.shouldFail(UploadUnhappinessError, + "test_exception_messages_during_server_selection1", "placed 0 shares out of 10 " "total (10 homeless), want to place shares on at " "least 4 servers such that any 3 of them have " @@ -1711,7 +1712,8 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin, d.addCallback(lambda ign: self.remove_server(0)) d.addCallback(_reset_encoding_parameters) d.addCallback(lambda client: - self.shouldFail(UploadUnhappinessError, "test_selection_exceptions", + self.shouldFail(UploadUnhappinessError, + "test_exception_messages_during_server_selection2", "placed 0 shares out of 10 " "total (10 homeless), want to place shares on at " "least 4 servers such that any 3 of them have " @@ -1732,7 +1734,8 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin, self._add_server(server_number=1)) d.addCallback(_reset_encoding_parameters) d.addCallback(lambda client: - self.shouldFail(UploadUnhappinessError, "test_selection_exceptions", + self.shouldFail(UploadUnhappinessError, + "test_exception_messages_during_server_selection3", "shares could be placed or found on only 2 " "server(s). We were asked to place shares on at " "least 4 server(s) such that any 3 of them have " @@ -1757,7 +1760,8 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin, self._add_server(server_number=4)) d.addCallback(_reset_encoding_parameters, happy=7) d.addCallback(lambda client: - self.shouldFail(UploadUnhappinessError, "test_selection_exceptions", + self.shouldFail(UploadUnhappinessError, + "test_exception_messages_during_server_selection4", "shares could be placed on only 5 server(s) such " "that any 3 of them have enough shares to recover " "the file, but we were asked to place shares on " @@ -1786,7 +1790,8 @@ class EncodingParameters(GridTestMixin, unittest.TestCase, SetDEPMixin, readonly=True)) d.addCallback(_reset_encoding_parameters, happy=7) d.addCallback(lambda client: - self.shouldFail(UploadUnhappinessError, "test_selection_exceptions", + self.shouldFail(UploadUnhappinessError, + "test_exception_messages_during_server_selection5", "shares could be placed or found on 4 server(s), " "but they are not spread out evenly enough to " "ensure that any 3 of these servers would have " -- 2.45.2