Skip to content

Commit 49b74ca

Browse files
committed
Remove unused test_suite() that now causes unittest and pytest warnings
supervisor/tests/test_confecho.py::test_suite /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. return unittest.findTestCases(sys.modules[__name__]) supervisor/tests/test_confecho.py::test_suite /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`?
1 parent 74e206a commit 49b74ca

17 files changed

+0
-123
lines changed

supervisor/tests/test_childutils.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,3 @@ def test_send(self):
132132
listener.send(msg, stdout)
133133
expected = '%s%s\n%s' % (begin, len(msg), msg)
134134
self.assertEqual(stdout.getvalue(), expected)
135-
136-
137-
def test_suite():
138-
return unittest.findTestCases(sys.modules[__name__])
139-
140-
if __name__ == '__main__':
141-
unittest.main(defaultTest='test_suite')

supervisor/tests/test_confecho.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,3 @@ def test_main_writes_data_out_that_looks_like_a_config_file(self):
1212

1313
output = sio.getvalue()
1414
self.assertTrue("[supervisord]" in output)
15-
16-
17-
def test_suite():
18-
return unittest.findTestCases(sys.modules[__name__])
19-
20-
if __name__ == '__main__':
21-
unittest.main(defaultTest='test_suite')

supervisor/tests/test_dispatchers.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,9 +1227,3 @@ def test_ansi(self):
12271227
def test_noansi(self):
12281228
noansi = b'Hello world... this is longer than a token!'
12291229
self.assertEqual(self._callFUT(noansi), noansi)
1230-
1231-
def test_suite():
1232-
return unittest.findTestCases(sys.modules[__name__])
1233-
1234-
if __name__ == '__main__':
1235-
unittest.main(defaultTest='test_suite')

supervisor/tests/test_end_to_end.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -419,9 +419,3 @@ def test_issue_1483c_identifier_from_command_line(self):
419419
finally:
420420
transport.close()
421421
self.assertEqual(ident, "from_command_line")
422-
423-
def test_suite():
424-
return unittest.findTestCases(sys.modules[__name__])
425-
426-
if __name__ == '__main__':
427-
unittest.main(defaultTest='test_suite')

supervisor/tests/test_events.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -508,10 +508,3 @@ class FooEvent(events.Event):
508508
self.assertTrue(events.EventTypes.FOO is FooEvent)
509509
finally:
510510
del events.EventTypes.FOO
511-
512-
def test_suite():
513-
return unittest.findTestCases(sys.modules[__name__])
514-
515-
if __name__ == '__main__':
516-
unittest.main(defaultTest='test_suite')
517-

supervisor/tests/test_http.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -684,9 +684,3 @@ def more(self):
684684
return self.data.pop(0)
685685
else:
686686
return b''
687-
688-
def test_suite():
689-
return unittest.findTestCases(sys.modules[__name__])
690-
691-
if __name__ == '__main__':
692-
unittest.main(defaultTest='test_suite')

supervisor/tests/test_loggers.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -599,9 +599,3 @@ def emit(self, record):
599599
self.records.append(record)
600600
def close(self):
601601
self.closed = True
602-
603-
def test_suite():
604-
return unittest.findTestCases(sys.modules[__name__])
605-
606-
if __name__ == '__main__':
607-
unittest.main(defaultTest='test_suite')

supervisor/tests/test_options.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3858,9 +3858,3 @@ def test_split_namespec(self):
38583858
self.assertEqual(s('process'), ('process', 'process'))
38593859
self.assertEqual(s('group:'), ('group', None))
38603860
self.assertEqual(s('group:*'), ('group', None))
3861-
3862-
def test_suite():
3863-
return unittest.findTestCases(sys.modules[__name__])
3864-
3865-
if __name__ == '__main__':
3866-
unittest.main(defaultTest='test_suite')

supervisor/tests/test_poller.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -437,10 +437,3 @@ class FakeKEvent(object):
437437
def __init__(self, ident, filter):
438438
self.ident = ident
439439
self.filter = filter
440-
441-
442-
def test_suite():
443-
return unittest.findTestCases(sys.modules[__name__])
444-
445-
if __name__ == '__main__':
446-
unittest.main(defaultTest='test_suite')

supervisor/tests/test_rpcinterfaces.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,14 +2392,6 @@ def test_it(self):
23922392
)
23932393

23942394

2395-
23962395
class DummyRPCInterface:
23972396
def hello(self):
23982397
return 'Hello!'
2399-
2400-
def test_suite():
2401-
return unittest.findTestCases(sys.modules[__name__])
2402-
2403-
if __name__ == '__main__':
2404-
unittest.main(defaultTest='test_suite')
2405-

0 commit comments

Comments
 (0)