@@ -13,7 +13,21 @@ def test_include_empty():
13
13
mock_get_items = mock .Mock (return_value = ['a' , 'b' , 'c' , 'd' , 'e' , 'f' , 'g' ])
14
14
d = Discovery (mock_get_items )
15
15
assert list (d .get_items ()) == []
16
- assert mock_get_items .call_count == 1
16
+ assert mock_get_items .mock_calls == [mock .call ()]
17
+
18
+
19
+ def test_include_empty_exclude_non_empty ():
20
+ mock_get_items = mock .Mock (return_value = ['a' , 'b' , 'c' , 'd' , 'e' , 'f' , 'g' ])
21
+ d = Discovery (mock_get_items , exclude = ['b.*' ])
22
+ assert list (d .get_items ()) == []
23
+ assert mock_get_items .mock_calls == [mock .call ()]
24
+
25
+
26
+ def test_include_empty_limit ():
27
+ mock_get_items = mock .Mock (return_value = ['a' , 'b' , 'c' , 'd' , 'e' , 'f' , 'g' ])
28
+ d = Discovery (mock_get_items , limit = 1 )
29
+ assert list (d .get_items ()) == []
30
+ assert mock_get_items .mock_calls == [mock .call ()]
17
31
18
32
19
33
@pytest .mark .parametrize (
@@ -33,21 +47,21 @@ def test_include_not_empty(pattern):
33
47
mock_get_items = mock .Mock (return_value = ['a' , 'b' , 'c' , 'd' , 'e' , 'f' , 'g' ])
34
48
d = Discovery (mock_get_items , include = {pattern : None })
35
49
assert list (d .get_items ()) == [(pattern , 'a' , 'a' , None )]
36
- assert mock_get_items .call_count == 1
50
+ assert mock_get_items .mock_calls == [ mock . call ()]
37
51
38
52
39
53
def test_include_processed_in_order ():
40
54
mock_get_items = mock .Mock (return_value = ['a' , 'b' , 'c' , 'd' , 'e' , 'f' , 'g' ])
41
55
d = Discovery (mock_get_items , include = {'c.*' : {'value' : 5 }, 'a.*' : {'value' : 10 }})
42
56
assert list (d .get_items ()) == [('c.*' , 'c' , 'c' , {'value' : 5 }), ('a.*' , 'a' , 'a' , {'value' : 10 })]
43
- assert mock_get_items .call_count == 1
57
+ assert mock_get_items .mock_calls == [ mock . call ()]
44
58
45
59
46
60
def test_exclude_and_include_intersection_is_empty ():
47
61
mock_get_items = mock .Mock (return_value = ['a' , 'b' , 'c' , 'd' , 'e' , 'f' , 'g' ])
48
62
d = Discovery (mock_get_items , include = {'a.*' : None }, exclude = ['b.*' ])
49
63
assert list (d .get_items ()) == [('a.*' , 'a' , 'a' , None )]
50
- assert mock_get_items .call_count == 1
64
+ assert mock_get_items .mock_calls == [ mock . call ()]
51
65
52
66
53
67
def test_exclude_is_subset_of_include ():
@@ -61,21 +75,21 @@ def test_exclude_is_subset_of_include():
61
75
('.*' , 'f' , 'f' , None ),
62
76
('.*' , 'g' , 'g' , None ),
63
77
]
64
- assert mock_get_items .call_count == 1
78
+ assert mock_get_items .mock_calls == [ mock . call ()]
65
79
66
80
67
81
def test_exclude_is_equals_to_include ():
68
82
mock_get_items = mock .Mock (return_value = ['a' , 'b' , 'c' , 'd' , 'e' , 'f' , 'g' ])
69
83
d = Discovery (limit = 10 , include = {'b.*' : None }, exclude = ['b.*' ], interval = 0 , get_items_func = mock_get_items )
70
84
assert list (d .get_items ()) == []
71
- assert mock_get_items .call_count == 1
85
+ assert mock_get_items .mock_calls == [ mock . call ()]
72
86
73
87
74
88
def test_limit_zero ():
75
89
mock_get_items = mock .Mock (return_value = ['a' , 'b' , 'c' , 'd' , 'e' , 'f' , 'g' ])
76
90
d = Discovery (mock_get_items , limit = 0 , include = {'.*' : None })
77
91
assert list (d .get_items ()) == []
78
- assert mock_get_items .call_count == 1
92
+ assert mock_get_items .mock_calls == [ mock . call ()]
79
93
80
94
81
95
def test_limit_none ():
@@ -90,7 +104,7 @@ def test_limit_none():
90
104
('.*' , 'f' , 'f' , None ),
91
105
('.*' , 'g' , 'g' , None ),
92
106
]
93
- assert mock_get_items .call_count == 1
107
+ assert mock_get_items .mock_calls == [ mock . call ()]
94
108
95
109
96
110
def test_limit_greater_than_zero ():
@@ -103,7 +117,7 @@ def test_limit_greater_than_zero():
103
117
('.*' , 'd' , 'd' , {'value' : 5 }),
104
118
('.*' , 'e' , 'e' , {'value' : 5 }),
105
119
]
106
- assert mock_get_items .call_count == 1
120
+ assert mock_get_items .mock_calls == [ mock . call ()]
107
121
108
122
109
123
def test_limit_greater_than_items_len ():
@@ -118,7 +132,7 @@ def test_limit_greater_than_items_len():
118
132
('.*' , 'f' , 'f' , None ),
119
133
('.*' , 'g' , 'g' , None ),
120
134
]
121
- assert mock_get_items .call_count == 1
135
+ assert mock_get_items .mock_calls == [ mock . call ()]
122
136
123
137
124
138
def test_interval_none_two_calls_to_get_items_func ():
@@ -131,7 +145,7 @@ def test_interval_none_two_calls_to_get_items_func():
131
145
('.*' , 'c' , 'c' , None ),
132
146
('.*' , 'd' , 'd' , None ),
133
147
]
134
- assert mock_get_items .call_count == 2
148
+ assert mock_get_items .mock_calls == [ mock . call (), mock . call ()]
135
149
136
150
137
151
def test_interval_zero_two_calls_to_get_items_func ():
@@ -144,7 +158,7 @@ def test_interval_zero_two_calls_to_get_items_func():
144
158
('.*' , 'c' , 'c' , None ),
145
159
('.*' , 'd' , 'd' , None ),
146
160
]
147
- assert mock_get_items .call_count == 2
161
+ assert mock_get_items .mock_calls == [ mock . call (), mock . call ()]
148
162
149
163
150
164
def test_interval_not_exceeded ():
@@ -153,7 +167,7 @@ def test_interval_not_exceeded():
153
167
d = Discovery (mock_get_items , include = {'.*' : None }, interval = 60 )
154
168
assert list (d .get_items ()) == [('.*' , 'a' , 'a' , None ), ('.*' , 'b' , 'b' , None )]
155
169
assert list (d .get_items ()) == [('.*' , 'a' , 'a' , None ), ('.*' , 'b' , 'b' , None )]
156
- assert mock_get_items .call_count == 1
170
+ assert mock_get_items .mock_calls == [ mock . call ()]
157
171
158
172
159
173
def test_interval_exceeded ():
@@ -167,11 +181,11 @@ def test_interval_exceeded():
167
181
('.*' , 'c' , 'c' , None ),
168
182
('.*' , 'd' , 'd' , None ),
169
183
]
170
- assert mock_get_items .call_count == 2
184
+ assert mock_get_items .mock_calls == [ mock . call (), mock . call ()]
171
185
172
186
173
187
def test_key_in_items ():
174
188
mock_get_items = mock .Mock (return_value = [{'key' : 'a' , 'value' : 75 }, {'key' : 'b' , 'value' : 89 }])
175
189
d = Discovery (mock_get_items , include = {'a.*' : {'filter' : 'xxxx' }}, key = lambda item : item ['key' ])
176
190
assert list (d .get_items ()) == [('a.*' , 'a' , {'key' : 'a' , 'value' : 75 }, {'filter' : 'xxxx' })]
177
- assert mock_get_items .call_count == 1
191
+ assert mock_get_items .mock_calls == [ mock . call ()]
0 commit comments