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`?

Author: mnaberez

supervisor/tests/test_childutils.py

@@ -132,10 +132,3 @@ def test_send(self):
         listener.send(msg, stdout)
         expected = '%s%s\n%s' % (begin, len(msg), msg)
         self.assertEqual(stdout.getvalue(), expected)
-
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_confecho.py

@@ -12,10 +12,3 @@ def test_main_writes_data_out_that_looks_like_a_config_file(self):
 
         output = sio.getvalue()
         self.assertTrue("[supervisord]" in output)
-
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_dispatchers.py

@@ -1227,9 +1227,3 @@ def test_ansi(self):
     def test_noansi(self):
         noansi = b'Hello world... this is longer than a token!'
         self.assertEqual(self._callFUT(noansi), noansi)
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_end_to_end.py

@@ -419,9 +419,3 @@ def test_issue_1483c_identifier_from_command_line(self):
         finally:
             transport.close()
         self.assertEqual(ident, "from_command_line")
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_events.py

@@ -508,10 +508,3 @@ class FooEvent(events.Event):
             self.assertTrue(events.EventTypes.FOO is FooEvent)
         finally:
             del events.EventTypes.FOO
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-

supervisor/tests/test_http.py

@@ -684,9 +684,3 @@ def more(self):
             return self.data.pop(0)
         else:
             return b''
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_loggers.py

@@ -599,9 +599,3 @@ def emit(self, record):
         self.records.append(record)
     def close(self):
         self.closed = True
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_options.py

@@ -3858,9 +3858,3 @@ def test_split_namespec(self):
         self.assertEqual(s('process'), ('process', 'process'))
         self.assertEqual(s('group:'), ('group', None))
         self.assertEqual(s('group:*'), ('group', None))
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_poller.py

@@ -437,10 +437,3 @@ class FakeKEvent(object):
     def __init__(self, ident, filter):
         self.ident = ident
         self.filter = filter
-
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_rpcinterfaces.py

@@ -2392,14 +2392,6 @@ def test_it(self):
             )
 
 
-
 class DummyRPCInterface:
     def hello(self):
         return 'Hello!'
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-

supervisor/tests/test_socket_manager.py

@@ -51,7 +51,6 @@ def test_on_delete(self):
         proxy = self._makeOne(Subject(), on_delete=self.setOnDeleteCalled)
         self.assertEqual(5, proxy.getValue())
         proxy = None
-        gc_collect()
         self.assertTrue(self.on_deleteCalled)
 
 class ReferenceCounterTest(unittest.TestCase):
@@ -94,9 +93,6 @@ def test_decr_at_zero_raises_error(self):
 
 class SocketManagerTest(unittest.TestCase):
 
-    def tearDown(self):
-        gc_collect()
-
     def _getTargetClass(self):
         from supervisor.socket_manager import SocketManager
         return SocketManager
@@ -160,12 +156,10 @@ def test_socket_lifecycle(self):
         self.assertTrue(sock_manager.is_prepared())
         self.assertFalse(sock_manager.socket.close_called)
         sock = None
-        gc_collect()
         # Socket not actually closed yet b/c ref ct is 1
         self.assertTrue(sock_manager.is_prepared())
         self.assertFalse(sock_manager.socket.close_called)
         sock2 = None
-        gc_collect()
         # Socket closed
         self.assertFalse(sock_manager.is_prepared())
         self.assertTrue(sock_manager.socket.close_called)
@@ -178,7 +172,6 @@ def test_socket_lifecycle(self):
         self.assertNotEqual(sock_id, sock3_id)
         # Drop ref ct to zero
         del sock3
-        gc_collect()
         # Now assert that socket is closed
         self.assertFalse(sock_manager.is_prepared())
         self.assertTrue(sock_manager.socket.close_called)
@@ -193,7 +186,6 @@ def test_logging(self):
         self.assertEqual('Creating socket %s' % repr(conf), logger.data[0])
         # socket close
         del sock
-        gc_collect()
         self.assertEqual(len(logger.data), 2)
         self.assertEqual('Closing socket %s' % repr(conf), logger.data[1])
 
@@ -242,15 +234,3 @@ def test_close_requires_prepared_socket(self):
             self.fail()
         except Exception as e:
             self.assertEqual(e.args[0], 'Socket has not been prepared')
-
-def gc_collect():
-    if __pypy__ is not None:
-        gc.collect()
-        gc.collect()
-        gc.collect()
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_states.py

@@ -50,10 +50,3 @@ def test_getEventListenerStateDescription_returns_string_when_found(self):
     def test_getEventListenerStateDescription_returns_None_when_not_found(self):
         self.assertEqual(states.getEventListenerStateDescription(3.14159),
             None)
-    
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_supervisorctl.py

@@ -2067,10 +2067,3 @@ def __init__(self, controller=None):
 
     def do_help(self, arg):
         self.helped = True
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-

supervisor/tests/test_supervisord.py

@@ -834,10 +834,3 @@ def callback(event):
         self.assertEqual(supervisord.ticks[3600], 3600)
         self.assertEqual(len(L), 6)
         self.assertEqual(L[-1].__class__, events.Tick3600Event)
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-

supervisor/tests/test_templating.py

@@ -1785,12 +1785,3 @@ def normalize_xml(s):
     s = re.sub(r"(?s)\s+<", "<", s)
     s = re.sub(r"(?s)>\s+", ">", s)
     return s
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-def main():
-    unittest.main(defaultTest='test_suite')
-
-if __name__ == '__main__':
-    main()

supervisor/tests/test_web.py

@@ -177,9 +177,3 @@ def test_render_refresh(self):
 
 class DummyContext:
     pass
-
-def test_suite():
-    return unittest.findTestCases(sys.modules[__name__])
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')

supervisor/tests/test_xmlrpc.py

@@ -917,4 +917,3 @@ def request(self, *arg, **kw):
 
     def close(self):
         self.closed = True
-