Merge pull request #3257 from locustio/fix-single-line-conf-files-incorrectly-being-treated-as-toml

Fix single line .conf files incorrectly being treated as toml

Author: cyberw

locust/argument_parser.py

@@ -133,6 +133,9 @@ def parse(self, stream):
                     else:
                         result[key] = str(value)
                 break
+        else:
+            if not stream.name.endswith("toml"):
+                raise configargparse.ConfigFileParserException("Not a toml file. Fall back to DefaultConfigFileParser.")
 
         return result
 

locust/test/test_parser.py

@@ -58,6 +58,16 @@ def test_parse_options_from_conf_file(self):
         self.assertEqual(["Critical", "Normal"], options.tags)
         self.assertEqual("https://example.com", options.host)
 
+    def test_parse_single_line_conf_file(self):  # there was an issue with conf files identified as toml
+        with NamedTemporaryFile(mode="w", suffix=".conf") as file:
+            config_data = "users = 10\n"
+            file.write(config_data)
+            file.flush()
+            parser = get_parser(default_config_files=[file.name])
+            options = parser.parse_args()
+
+        self.assertEqual(10, options.num_users)
+
     def test_parse_options_from_toml_file(self):
         with NamedTemporaryFile(mode="w", suffix=".toml") as file:
             config_data = """\