blob: d43b0b41e65a3d5a5c73507be2a8420f39c4f4f1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From 7238c1148c756e6a27c3dbc1ccbff7a3e9a60d82 Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jamielennox@gmail.com>
Date: Fri, 28 May 2021 09:33:25 +0700
Subject: [PATCH] Fix failing pytest
When you start a method with test_ pytest loads it and tries to parse
the parameters as fixtures. In this case it's not a real test, just a
matcher function used later on in the test file.
We can inline it into the function as it's only used in one place.
Fixes: #175
---
tests/test_custom_matchers.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/test_custom_matchers.py b/tests/test_custom_matchers.py
index d49f72a..546a63e 100644
--- a/tests/test_custom_matchers.py
+++ b/tests/test_custom_matchers.py
@@ -31,13 +31,6 @@ def match_all(request):
return requests_mock.create_response(request, content=six.b('data'))
-def test_a(request):
- if 'a' in request.url:
- return match_all(request)
-
- return None
-
-
class CustomMatchersTests(base.TestCase):
def assertMatchAll(self, resp):
@@ -65,7 +58,14 @@ def test_failing_matcher(self, mocker):
@requests_mock.Mocker()
def test_some_pass(self, mocker):
- mocker.add_matcher(test_a)
+
+ def matcher_a(request):
+ if 'a' in request.url:
+ return match_all(request)
+
+ return None
+
+ mocker.add_matcher(matcher_a)
resp = requests.get('http://any/thing')
self.assertMatchAll(resp)
|
