pyrox.dev
1From e18f91d4ddbc30920c828e782ce40fbe844fcab9 Mon Sep 17 00:00:00 2001
2From: Mike Naberezny <mike@naberezny.com>
3Date: Sun, 25 Dec 2022 10:58:24 -0800
4Subject: [PATCH] Remove unused test_suite() that now causes unittest and
5 pytest warnings
6
7supervisor/tests/test_confecho.py::test_suite
8 /home/runner/work/supervisor/supervisor/supervisor/tests/test_confecho.py:18: DeprecationWarning: unittest.findTestCases() is deprecated and will be removed in Python 3.13. Please use unittest.TestLoader.loadTestsFromModule() instead.
9 return unittest.findTestCases(sys.modules[__name__])
10
11supervisor/tests/test_confecho.py::test_suite
12 /home/runner/work/supervisor/supervisor/.tox/py311/lib/python3.11/site-packages/_pytest/python.py:199: PytestReturnNotNoneWarning: Expected None, but supervisor/tests/test_confecho.py::test_suite returned <unittest.suite.TestSuite tests=[<unittest.suite.TestSuite tests=[<supervisor.tests.test_confecho.TopLevelFunctionTests testMethod=test_main_writes_data_out_that_looks_like_a_config_file>]>]>, which will be an error in a future version of pytest. Did you mean to use `assert` instead of `return`?
13---
14 supervisor/tests/test_childutils.py | 7 -------
15 supervisor/tests/test_confecho.py | 7 -------
16 supervisor/tests/test_dispatchers.py | 6 ------
17 supervisor/tests/test_end_to_end.py | 6 ------
18 supervisor/tests/test_events.py | 7 -------
19 supervisor/tests/test_http.py | 6 ------
20 supervisor/tests/test_loggers.py | 6 ------
21 supervisor/tests/test_options.py | 7 -------
22 supervisor/tests/test_poller.py | 7 -------
23 supervisor/tests/test_rpcinterfaces.py | 8 --------
24 supervisor/tests/test_socket_manager.py | 20 --------------------
25 supervisor/tests/test_states.py | 7 -------
26 supervisor/tests/test_supervisorctl.py | 7 -------
27 supervisor/tests/test_supervisord.py | 7 -------
28 supervisor/tests/test_templating.py | 9 ---------
29 supervisor/tests/test_web.py | 6 ------
30 supervisor/tests/test_xmlrpc.py | 1 -
31 17 files changed, 124 deletions(-)
32
33diff --git a/supervisor/tests/test_childutils.py b/supervisor/tests/test_childutils.py
34index f2b39d8..94193fc 100644
35--- a/supervisor/tests/test_childutils.py
36+++ b/supervisor/tests/test_childutils.py
37@@ -132,10 +132,3 @@ class TestEventListenerProtocol(unittest.TestCase):
38 listener.send(msg, stdout)
39 expected = '%s%s\n%s' % (begin, len(msg), msg)
40 self.assertEqual(stdout.getvalue(), expected)
41-
42-
43-def test_suite():
44- return unittest.findTestCases(sys.modules[__name__])
45-
46-if __name__ == '__main__':
47- unittest.main(defaultTest='test_suite')
48diff --git a/supervisor/tests/test_confecho.py b/supervisor/tests/test_confecho.py
49index 6ae5108..f35f845 100644
50--- a/supervisor/tests/test_confecho.py
51+++ b/supervisor/tests/test_confecho.py
52@@ -12,10 +12,3 @@ class TopLevelFunctionTests(unittest.TestCase):
53
54 output = sio.getvalue()
55 self.assertTrue("[supervisord]" in output)
56-
57-
58-def test_suite():
59- return unittest.findTestCases(sys.modules[__name__])
60-
61-if __name__ == '__main__':
62- unittest.main(defaultTest='test_suite')
63diff --git a/supervisor/tests/test_dispatchers.py b/supervisor/tests/test_dispatchers.py
64index 87692e2..ee6e44a 100644
65--- a/supervisor/tests/test_dispatchers.py
66+++ b/supervisor/tests/test_dispatchers.py
67@@ -1227,9 +1227,3 @@ class stripEscapeTests(unittest.TestCase):
68 def test_noansi(self):
69 noansi = b'Hello world... this is longer than a token!'
70 self.assertEqual(self._callFUT(noansi), noansi)
71-
72-def test_suite():
73- return unittest.findTestCases(sys.modules[__name__])
74-
75-if __name__ == '__main__':
76- unittest.main(defaultTest='test_suite')
77diff --git a/supervisor/tests/test_end_to_end.py b/supervisor/tests/test_end_to_end.py
78index dd5c977..763da48 100644
79--- a/supervisor/tests/test_end_to_end.py
80+++ b/supervisor/tests/test_end_to_end.py
81@@ -419,9 +419,3 @@ class EndToEndTests(BaseTestCase):
82 finally:
83 transport.close()
84 self.assertEqual(ident, "from_command_line")
85-
86-def test_suite():
87- return unittest.findTestCases(sys.modules[__name__])
88-
89-if __name__ == '__main__':
90- unittest.main(defaultTest='test_suite')
91diff --git a/supervisor/tests/test_events.py b/supervisor/tests/test_events.py
92index bd33a0c..a432da8 100644
93--- a/supervisor/tests/test_events.py
94+++ b/supervisor/tests/test_events.py
95@@ -508,10 +508,3 @@ class TestUtilityFunctions(unittest.TestCase):
96 self.assertTrue(events.EventTypes.FOO is FooEvent)
97 finally:
98 del events.EventTypes.FOO
99-
100-def test_suite():
101- return unittest.findTestCases(sys.modules[__name__])
102-
103-if __name__ == '__main__':
104- unittest.main(defaultTest='test_suite')
105-
106diff --git a/supervisor/tests/test_http.py b/supervisor/tests/test_http.py
107index 1198597..f4c4496 100644
108--- a/supervisor/tests/test_http.py
109+++ b/supervisor/tests/test_http.py
110@@ -684,9 +684,3 @@ class DummyProducer:
111 return self.data.pop(0)
112 else:
113 return b''
114-
115-def test_suite():
116- return unittest.findTestCases(sys.modules[__name__])
117-
118-if __name__ == '__main__':
119- unittest.main(defaultTest='test_suite')
120diff --git a/supervisor/tests/test_loggers.py b/supervisor/tests/test_loggers.py
121index 0742c17..a9ae297 100644
122--- a/supervisor/tests/test_loggers.py
123+++ b/supervisor/tests/test_loggers.py
124@@ -599,9 +599,3 @@ class DummyHandler:
125 self.records.append(record)
126 def close(self):
127 self.closed = True
128-
129-def test_suite():
130- return unittest.findTestCases(sys.modules[__name__])
131-
132-if __name__ == '__main__':
133- unittest.main(defaultTest='test_suite')
134diff --git a/supervisor/tests/test_options.py b/supervisor/tests/test_options.py
135index f43537a..18e7399 100644
136--- a/supervisor/tests/test_options.py
137+++ b/supervisor/tests/test_options.py
138@@ -3804,10 +3804,3 @@ class UtilFunctionsTests(unittest.TestCase):
139 self.assertEqual(s('process'), ('process', 'process'))
140 self.assertEqual(s('group:'), ('group', None))
141 self.assertEqual(s('group:*'), ('group', None))
142-
143-def test_suite():
144- return unittest.findTestCases(sys.modules[__name__])
145-
146-if __name__ == '__main__':
147- unittest.main(defaultTest='test_suite')
148-
149diff --git a/supervisor/tests/test_poller.py b/supervisor/tests/test_poller.py
150index 1b12a8e..fb5bf81 100644
151--- a/supervisor/tests/test_poller.py
152+++ b/supervisor/tests/test_poller.py
153@@ -437,10 +437,3 @@ class FakeKEvent(object):
154 def __init__(self, ident, filter):
155 self.ident = ident
156 self.filter = filter
157-
158-
159-def test_suite():
160- return unittest.findTestCases(sys.modules[__name__])
161-
162-if __name__ == '__main__':
163- unittest.main(defaultTest='test_suite')
164diff --git a/supervisor/tests/test_rpcinterfaces.py b/supervisor/tests/test_rpcinterfaces.py
165index 0827adf..ec88a90 100644
166--- a/supervisor/tests/test_rpcinterfaces.py
167+++ b/supervisor/tests/test_rpcinterfaces.py
168@@ -2392,14 +2392,6 @@ class Test_make_main_rpcinterface(unittest.TestCase):
169 )
170
171
172-
173 class DummyRPCInterface:
174 def hello(self):
175 return 'Hello!'
176-
177-def test_suite():
178- return unittest.findTestCases(sys.modules[__name__])
179-
180-if __name__ == '__main__':
181- unittest.main(defaultTest='test_suite')
182-
183diff --git a/supervisor/tests/test_socket_manager.py b/supervisor/tests/test_socket_manager.py
184index 626d786..8eaafaa 100644
185--- a/supervisor/tests/test_socket_manager.py
186+++ b/supervisor/tests/test_socket_manager.py
187@@ -51,7 +51,6 @@ class ProxyTest(unittest.TestCase):
188 proxy = self._makeOne(Subject(), on_delete=self.setOnDeleteCalled)
189 self.assertEqual(5, proxy.getValue())
190 proxy = None
191- gc_collect()
192 self.assertTrue(self.on_deleteCalled)
193
194 class ReferenceCounterTest(unittest.TestCase):
195@@ -94,9 +93,6 @@ class ReferenceCounterTest(unittest.TestCase):
196
197 class SocketManagerTest(unittest.TestCase):
198
199- def tearDown(self):
200- gc_collect()
201-
202 def _getTargetClass(self):
203 from supervisor.socket_manager import SocketManager
204 return SocketManager
205@@ -160,12 +156,10 @@ class SocketManagerTest(unittest.TestCase):
206 self.assertTrue(sock_manager.is_prepared())
207 self.assertFalse(sock_manager.socket.close_called)
208 sock = None
209- gc_collect()
210 # Socket not actually closed yet b/c ref ct is 1
211 self.assertTrue(sock_manager.is_prepared())
212 self.assertFalse(sock_manager.socket.close_called)
213 sock2 = None
214- gc_collect()
215 # Socket closed
216 self.assertFalse(sock_manager.is_prepared())
217 self.assertTrue(sock_manager.socket.close_called)
218@@ -178,7 +172,6 @@ class SocketManagerTest(unittest.TestCase):
219 self.assertNotEqual(sock_id, sock3_id)
220 # Drop ref ct to zero
221 del sock3
222- gc_collect()
223 # Now assert that socket is closed
224 self.assertFalse(sock_manager.is_prepared())
225 self.assertTrue(sock_manager.socket.close_called)
226@@ -193,7 +186,6 @@ class SocketManagerTest(unittest.TestCase):
227 self.assertEqual('Creating socket %s' % repr(conf), logger.data[0])
228 # socket close
229 del sock
230- gc_collect()
231 self.assertEqual(len(logger.data), 2)
232 self.assertEqual('Closing socket %s' % repr(conf), logger.data[1])
233
234@@ -242,15 +234,3 @@ class SocketManagerTest(unittest.TestCase):
235 self.fail()
236 except Exception as e:
237 self.assertEqual(e.args[0], 'Socket has not been prepared')
238-
239-def gc_collect():
240- if __pypy__ is not None:
241- gc.collect()
242- gc.collect()
243- gc.collect()
244-
245-def test_suite():
246- return unittest.findTestCases(sys.modules[__name__])
247-
248-if __name__ == '__main__':
249- unittest.main(defaultTest='test_suite')
250diff --git a/supervisor/tests/test_states.py b/supervisor/tests/test_states.py
251index ba8e58f..41fed7b 100644
252--- a/supervisor/tests/test_states.py
253+++ b/supervisor/tests/test_states.py
254@@ -50,10 +50,3 @@ class TopLevelEventListenerStateTests(unittest.TestCase):
255 def test_getEventListenerStateDescription_returns_None_when_not_found(self):
256 self.assertEqual(states.getEventListenerStateDescription(3.14159),
257 None)
258-
259-
260-def test_suite():
261- return unittest.findTestCases(sys.modules[__name__])
262-
263-if __name__ == '__main__':
264- unittest.main(defaultTest='test_suite')
265diff --git a/supervisor/tests/test_supervisorctl.py b/supervisor/tests/test_supervisorctl.py
266index 3c0e097..af2149b 100644
267--- a/supervisor/tests/test_supervisorctl.py
268+++ b/supervisor/tests/test_supervisorctl.py
269@@ -2067,10 +2067,3 @@ class DummyPlugin:
270
271 def do_help(self, arg):
272 self.helped = True
273-
274-def test_suite():
275- return unittest.findTestCases(sys.modules[__name__])
276-
277-if __name__ == '__main__':
278- unittest.main(defaultTest='test_suite')
279-
280diff --git a/supervisor/tests/test_supervisord.py b/supervisor/tests/test_supervisord.py
281index 3d7b4ff..4099bba 100644
282--- a/supervisor/tests/test_supervisord.py
283+++ b/supervisor/tests/test_supervisord.py
284@@ -834,10 +834,3 @@ class SupervisordTests(unittest.TestCase):
285 self.assertEqual(supervisord.ticks[3600], 3600)
286 self.assertEqual(len(L), 6)
287 self.assertEqual(L[-1].__class__, events.Tick3600Event)
288-
289-def test_suite():
290- return unittest.findTestCases(sys.modules[__name__])
291-
292-if __name__ == '__main__':
293- unittest.main(defaultTest='test_suite')
294-
295diff --git a/supervisor/tests/test_templating.py b/supervisor/tests/test_templating.py
296index 29311a7..8970c4f 100644
297--- a/supervisor/tests/test_templating.py
298+++ b/supervisor/tests/test_templating.py
299@@ -1785,12 +1785,3 @@ def normalize_xml(s):
300 s = re.sub(r"(?s)\s+<", "<", s)
301 s = re.sub(r"(?s)>\s+", ">", s)
302 return s
303-
304-def test_suite():
305- return unittest.findTestCases(sys.modules[__name__])
306-
307-def main():
308- unittest.main(defaultTest='test_suite')
309-
310-if __name__ == '__main__':
311- main()
312diff --git a/supervisor/tests/test_web.py b/supervisor/tests/test_web.py
313index 8bae3ed..f31972d 100644
314--- a/supervisor/tests/test_web.py
315+++ b/supervisor/tests/test_web.py
316@@ -177,9 +177,3 @@ class StatusViewTests(unittest.TestCase):
317
318 class DummyContext:
319 pass
320-
321-def test_suite():
322- return unittest.findTestCases(sys.modules[__name__])
323-
324-if __name__ == '__main__':
325- unittest.main(defaultTest='test_suite')
326diff --git a/supervisor/tests/test_xmlrpc.py b/supervisor/tests/test_xmlrpc.py
327index 3d49ce0..8cee058 100644
328--- a/supervisor/tests/test_xmlrpc.py
329+++ b/supervisor/tests/test_xmlrpc.py
330@@ -917,4 +917,3 @@ class DummyConnection:
331
332 def close(self):
333 self.closed = True
334-
335--
3362.49.0
337