Updates to tests etc

locust/argument_parser.py

@@ -93,13 +93,6 @@ def parse(self, stream):
         return result
 
 
-def _is_package(path):
-    """
-    Is the given path a Python package?
-    """
-    return os.path.isdir(path) and os.path.exists(os.path.join(path, "__init__.py"))
-
-
 def parse_locustfile_paths(paths: list[str]) -> list[str]:
     """
     Returns a list of relative file paths.

locust/test/test_main.py

@@ -1048,7 +1048,6 @@ def test_with_package_as_locustfile(self):
                     stdout, stderr = proc.communicate()
                     self.assertIn("Starting Locust", stderr)
                     self.assertIn("All users spawned:", stderr)
-                    self.assertIn('"TestUser": 1', stderr)
                     self.assertIn('"UserSubclass": 1', stderr)
                     self.assertIn("Shutting down (exit code 0)", stderr)
                     self.assertEqual(0, proc.returncode)
@@ -1159,7 +1158,7 @@ def test_run_with_userclass_picker(self):
                     stderr=PIPE,
                     text=True,
                 )
-                gevent.sleep(1)
+                gevent.sleep(2)
                 proc.send_signal(signal.SIGTERM)
                 stdout, stderr = proc.communicate()
 
@@ -1832,7 +1831,7 @@ def t(self):
                 [
                     "locust",
                     "-f",
-                    mocked.file_path[:-3],  # remove ".py"
+                    mocked.file_path[-3],  # remove ".py"
                     "--headless",
                     "--master",
                 ],
@@ -1851,6 +1850,8 @@ def t(self):
                 stdout=PIPE,
                 text=True,
             )
+            gevent.sleep(1)
+
             stdout = proc_worker.communicate()[0]
             self.assertIn("Got error from master: locustfile parameter on master must be a plain filename", stdout)
             proc.kill()