ruff

Author: rerpha

installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py

@@ -1,7 +1,6 @@
 import glob
 import os
 import shutil
-import subprocess
 import tempfile
 import time
 from pathlib import Path

installation_and_upgrade/ibex_install_utils/tests/test_version_check.py

@@ -1,10 +1,11 @@
 import os
+import re
 from unittest.mock import Mock
 
 import pytest
 from ibex_install_utils.software_dependency import is_higher
 from ibex_install_utils.software_dependency.git import Git
-from ibex_install_utils.version_check import *
+from ibex_install_utils.version_check import get_major_minor_patch, version_check
 
 
 def get_version_from_name(name):
@@ -15,6 +16,7 @@ def get_version_from_name(name):
     version = re.search(r"([0-9]+\.[0-9]+(\.[0-9]+)+)", basename).group(1)
     return version
 
+
 MOCK_GIT_INSTALLERS = [
     "Git-2.3.0-1.exe",
     "Git-2.3.2-1-bit.exe",  # latest
@@ -24,8 +26,8 @@ def get_version_from_name(name):
 
 class TestVersionCheck:
     def test_is_higher(self):
-        assert is_higher("17.0", "17.0.1") == True
-        assert is_higher("17.0.6", "17.0.1") == False
+        assert is_higher("17.0", "17.0.1")
+        assert not is_higher("17.0.6", "17.0.1")
 
     def test_get_major_minor_patch(self):
         # good version patterns
@@ -45,35 +47,34 @@ def test_get_major_minor_patch(self):
         with pytest.raises(AttributeError):
             get_major_minor_patch("java 17.2.4")
 
-
     def test_GIVEN_git_latest_WHEN_version_checked_THEN_decorated_function_not_called(self):
-        gitMock = Git()
+        git_mock = Git()
 
-        gitMock.get_installed_version = Mock(return_value="2.3.2")
-        gitMock.get_version_of = Mock(side_effect=get_version_from_name)
-        gitMock.find_available = Mock(return_value=MOCK_GIT_INSTALLERS)
+        git_mock.get_installed_version = Mock(return_value="2.3.2")
+        git_mock.get_version_of = Mock(side_effect=get_version_from_name)
+        git_mock.find_available = Mock(return_value=MOCK_GIT_INSTALLERS)
 
-        functionMock = Mock()
+        func_mock = Mock()
 
-        @version_check(gitMock)
+        @version_check(git_mock)
         def function(_):
-            functionMock()
+            func_mock()
 
         function(self)
-        functionMock.assert_not_called()
+        func_mock.assert_not_called()
 
     def test_GIVEN_git_old_WHEN_version_checked_THEN_decorated_function_called(self):
-        gitMock = Git()
+        git_mock = Git()
 
-        gitMock.get_installed_version = Mock(return_value="2.3.0")
-        gitMock.get_version_of = Mock(side_effect=get_version_from_name)
-        gitMock.find_available = Mock(return_value=MOCK_GIT_INSTALLERS)
+        git_mock.get_installed_version = Mock(return_value="2.3.0")
+        git_mock.get_version_of = Mock(side_effect=get_version_from_name)
+        git_mock.find_available = Mock(return_value=MOCK_GIT_INSTALLERS)
 
-        functionMock = Mock()
+        func_mock = Mock()
 
-        @version_check(gitMock)
+        @version_check(git_mock)
         def function(_):
-            functionMock()
+            func_mock()
 
         function(self)
-        functionMock.assert_called_once()
+        func_mock.assert_called_once()