From 195763fc8f582c2fbd0bd45829229ffffad1ec77 Mon Sep 17 00:00:00 2001
From: Stephen Rosen <sirosen@globus.org>
Date: Fri, 31 May 2024 21:57:40 -0500
Subject: [PATCH] Fix a bug with ini configs lacking '.cfg' suffix

The check for which config loading path to use incorrectly treated
'.cfg' as the only valid suffix for ini configs.
This is not the case for a config loaded with `-c`.

To fix, introduce a regression test, then make some strategic use of
pathlib to simplify path/file inspection and fix the issue.

fixes #614
---
 docs/changelog.rst                     |  7 +++++++
 nose2/session.py                       | 18 +++++++++++-------
 nose2/tests/functional/test_session.py | 21 +++++++++++++++++++++
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 3a842fb9..5d0c4b30 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -13,6 +13,13 @@ testsuites.
 Unreleased
 ----------
 
+Fixed
+~~~~~
+
+* Fix a bug with config loading which caused custom ini configs not to load if
+  they were not named with a ``.cfg`` extension. Thanks :user:`grhwalls` for
+  the bug report!
+
 0.15.0 (2024-05-30)
 -------------------
 
diff --git a/nose2/session.py b/nose2/session.py
index bfc3e1d3..d6e527eb 100644
--- a/nose2/session.py
+++ b/nose2/session.py
@@ -1,8 +1,7 @@
 import argparse
 import logging
 import os
-
-# py2/py3 compatible load of SafeConfigParser/ConfigParser
+import pathlib
 from configparser import ConfigParser
 
 from nose2 import config, events, util
@@ -120,11 +119,12 @@ def loadConfigFiles(self, *filenames):
 
         """
         for filename in filenames:
-            if filename.endswith(".cfg"):
-                self.config.read(filename)
-            elif filename.endswith("pyproject.toml"):
-                if not os.path.exists(filename):
-                    continue
+            path = pathlib.Path(filename)
+            if not path.exists():
+                continue
+
+            # handle pyproject.toml case
+            if path.name == "pyproject.toml":
                 toml_config = load_toml(filename)
                 if not isinstance(toml_config.get("tool"), dict):
                     continue
@@ -133,6 +133,10 @@ def loadConfigFiles(self, *filenames):
                     continue
                 self.config.read_dict(tool_table["nose2"])
 
+            # else, use the config parser to read config data
+            else:
+                self.config.read(path)
+
     def loadPlugins(self, modules=None, exclude=None):
         """Load plugins.
 
diff --git a/nose2/tests/functional/test_session.py b/nose2/tests/functional/test_session.py
index 9f7061a7..27a1eb7e 100644
--- a/nose2/tests/functional/test_session.py
+++ b/nose2/tests/functional/test_session.py
@@ -1,4 +1,6 @@
+import pathlib
 import sys
+import tempfile
 import unittest
 
 from nose2 import session
@@ -6,6 +8,25 @@
 from nose2.tests._common import FunctionalTestCase, support_file
 
 
+def test_loading_config_from_ini_file_without_cfg_suffix():
+    """
+    Regression test for https://github.com/nose-devs/nose2/issues/614
+
+    It is possible to have nose2 config embedded in any ini config file, and it might
+    not have a recognizable name.
+    It is not guaranteed that filenames used for config will end in `.cfg`.
+    """
+    sess = session.Session()
+    with tempfile.TemporaryDirectory() as tmpdirname:
+        tmpdir = pathlib.Path(tmpdirname)
+
+        foo_ini = tmpdir / "foo.ini"
+        foo_ini.write_text("""[alpha]\na = 1""")
+
+        sess.loadConfigFiles(str(foo_ini))
+        assert sess.config.has_section("alpha")
+
+
 class SessionFunctionalTests(FunctionalTestCase):
     def setUp(self):
         self.s = session.Session()