Fix test

Author: WardBrian

cmdstanpy/utils.py

@@ -218,15 +218,9 @@ def cmdstan_version() -> Optional[Tuple[int, ...]]:
     """
     try:
         makefile = os.path.join(cmdstan_path(), 'makefile')
-    except ValueError:
+    except ValueError as e:
         get_logger().info('No CmdStan installation found.')
-        return None
-
-    if not os.path.exists(makefile):
-        get_logger().info(
-            'CmdStan installation %s missing makefile, cannot get version.',
-            cmdstan_path(),
-        )
+        get_logger().debug("%s", e)
         return None
 
     with open(makefile, 'r') as fd:

test/test_utils.py

@@ -14,7 +14,6 @@
 import string
 import tempfile
 import unittest
-from pathlib import Path
 from test import CustomTestCase
 
 import numpy as np
@@ -201,24 +200,15 @@ def test_cmdstan_version(self):
         with tempfile.TemporaryDirectory(
             prefix="cmdstan_tests", dir=_TMPDIR
         ) as tmpdir:
-            tdir = os.path.join(tmpdir, 'tmpdir_xxx')
-            os.makedirs(tdir)
-            fake_path = os.path.join(tdir, 'cmdstan-2.22.0')
-            os.makedirs(os.path.join(fake_path))
-            fake_bin = os.path.join(fake_path, 'bin')
-            os.makedirs(fake_bin)
-            Path(os.path.join(fake_bin, 'stanc' + EXTENSION)).touch()
-            with self.modified_environ(CMDSTAN=fake_path):
-                self.assertTrue(fake_path == cmdstan_path())
-                expect = (
-                    'CmdStan installation {} missing makefile, '
-                    'cannot get version.'.format(fake_path)
-                )
-                with LogCapture() as log:
-                    logging.getLogger()
-                    cmdstan_version()
-                log.check_present(('cmdstanpy', 'INFO', expect))
-                fake_makefile = os.path.join(fake_path, 'makefile')
+            tdir = pathlib.Path(tmpdir) / 'tmpdir_xxx'
+            fake_path = tdir / 'cmdstan-2.22.0'
+            fake_bin = fake_path / 'bin'
+            fake_bin.mkdir(parents=True)
+            fake_makefile = fake_path / 'makefile'
+            fake_makefile.touch()
+            (fake_bin / f'stanc{EXTENSION}').touch()
+            with self.modified_environ(CMDSTAN=str(fake_path)):
+                self.assertTrue(str(fake_path) == cmdstan_path())
                 with open(fake_makefile, 'w') as fd:
                     fd.write('...  CMDSTAN_VERSION := dont_need_no_mmp\n\n')
                 expect = (
@@ -229,6 +219,13 @@ def test_cmdstan_version(self):
                     logging.getLogger()
                     cmdstan_version()
                 log.check_present(('cmdstanpy', 'INFO', expect))
+
+                fake_makefile.unlink()
+                expect = StringComparison('.*does not contain "makefile".*')
+                with LogCapture() as log:
+                    logging.getLogger()
+                    cmdstan_version()
+                log.check_present(('cmdstanpy', 'DEBUG', expect))
         cmdstan_path()