adjustments after testing on Windows. Extension needed

treee111 · Jun 6, 2022 · e188ae0 · e188ae0
1 parent 94b4ffa
commit e188ae0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tests/test_setup.py b/tests/test_setup.py
@@ -39,10 +39,10 @@ def test_installed_programs_windows(self):
             self.assertTrue(os.path.exists(get_tooling_win_path(
                 ['Osmosis', 'bin', 'osmosis.bat'])))
             self.assertTrue(os.path.exists(
-                get_tooling_win_path(['osmconvert'])))
+                get_tooling_win_path(['osmconvert.exe'])))
             self.assertTrue(os.path.exists(
-                get_tooling_win_path(['osmfilter'])))
-            self.assertTrue(os.path.exists(get_tooling_win_path(['7za'])))
+                get_tooling_win_path(['osmfilter.exe'])))
+            self.assertTrue(os.path.exists(get_tooling_win_path(['7za.exe'])))
 
     def check_installation_of_program(self, program):
         """

diff --git a/wahoomc/setup_functions.py b/wahoomc/setup_functions.py
@@ -59,15 +59,15 @@ def check_installation_of_required_programs():
             sys.exit(
                 f"Osmosis is not available. {text_to_docu}")
 
-        if not os.path.exists(get_tooling_win_path(['osmconvert'])):
+        if not os.path.exists(get_tooling_win_path(['osmconvert.exe'])):
             sys.exit(
                 f"osmconvert is not available. {text_to_docu}")
 
-        if not os.path.exists(get_tooling_win_path(['osmfilter'])):
+        if not os.path.exists(get_tooling_win_path(['osmfilter.exe'])):
             sys.exit(
                 f"osmfilter is not available. {text_to_docu}")
 
-        if not os.path.exists(get_tooling_win_path(['7za'])):
+        if not os.path.exists(get_tooling_win_path(['7za.exe'])):
             sys.exit(
                 f"7za is not available. {text_to_docu}")