From 1b26df6cd0611878c992aeca92082f3a96757f29 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone <exarkun@twistedmatrix.com> Date: Wed, 16 Oct 2019 09:33:09 -0400 Subject: [PATCH] use MatchesStructure to assert both at once --- src/_zkapauthorizer/tests/test_storage_server.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/_zkapauthorizer/tests/test_storage_server.py b/src/_zkapauthorizer/tests/test_storage_server.py index 163c1b8..7f3c228 100644 --- a/src/_zkapauthorizer/tests/test_storage_server.py +++ b/src/_zkapauthorizer/tests/test_storage_server.py @@ -408,12 +408,11 @@ class PassValidationTests(TestCase): ) except MorePassesRequired as e: self.assertThat( - e.valid_count, - Equals(len(passes)), - ) - self.assertThat( - e.required_count, - Equals(required_count), + e, + MatchesStructure( + valid_count=Equals(len(passes)), + required_count=Equals(required_count), + ), ) else: self.fail("Expected MorePassesRequired, got {}".format(result)) -- GitLab