From 91e4d7a67fb9125ed16087c6894df7bdc258d516 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 4 May 2020 10:34:52 -0400
Subject: [PATCH] Fix mismerge syntax error
---
src/_zkapauthorizer/tests/test_plugin.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/_zkapauthorizer/tests/test_plugin.py b/src/_zkapauthorizer/tests/test_plugin.py
index c45efaf..f57e449 100644
--- a/src/_zkapauthorizer/tests/test_plugin.py
+++ b/src/_zkapauthorizer/tests/test_plugin.py
@@ -444,7 +444,6 @@ class ClientPluginTests(TestCase):
num_redemption_groups = token_count
store = VoucherStore.from_node_config(node_config, lambda: now)
- expected_pass_cost =
controller = PaymentController(
store,
DummyRedeemer(),
@@ -491,7 +490,7 @@ class ClientPluginTests(TestCase):
lambda logged_message: logged_message.message,
ContainsDict({
u"message": Equals(allocate_buckets_message(storage_index)),
- u"count": Equals(expected_pass_cost),
+ u"count": Equals(token_count),
}),
),
),
--
GitLab