Update wrapping to use assert_any_call where necessary (since 3.12 pa…

…th.join)
AikidoSec · Nov 5, 2024 · 828abc0 · 828abc0
1 parent be86542
commit 828abc0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/aikido_zen/sinks/tests/builtins_test.py b/aikido_zen/sinks/tests/builtins_test.py
@@ -34,13 +34,15 @@ def test_open():
         with pytest.raises(FileNotFoundError):
             open(path)
         args = (path,)
-        mock_run_vulnerability_scan.assert_called_with(kind=kind, op=op, args=args)
+        # Need to use assert_any_call, since python 3.12 it uses os.path.join
+        mock_run_vulnerability_scan.assert_any_call(kind=kind, op=op, args=args)
 
         path2 = PurePath("./test", "/test.py")
         with pytest.raises(FileNotFoundError):
             open(path2)
         args = (path2,)
-        mock_run_vulnerability_scan.assert_called_with(kind=kind, op=op, args=args)
+        # Need to use assert_any_call, since python 3.12 it uses os.path.join
+        mock_run_vulnerability_scan.assert_any_call(kind=kind, op=op, args=args)
 
 
 def test_open_with_builtins_import():

diff --git a/aikido_zen/sinks/tests/os_test.py b/aikido_zen/sinks/tests/os_test.py
@@ -19,9 +19,10 @@ def test_ospath_commands():
 
         with pytest.raises(FileNotFoundError):
             os.path.getsize("aqkqjefbkqlleq_qkvfjksaicuaviel")
-            op = "os.path.getsize"
-            args = ("aqkqjefbkqlleq_qkvfjksaicuaviel",)
-            mock_run_vulnerability_scan.assert_called_with(kind=kind, op=op, args=args)
+        op = "os.path.getsize"
+        args = ("aqkqjefbkqlleq_qkvfjksaicuaviel",)
+        # Need to use assert_any_call, since python 3.12 it uses os.path.join
+        mock_run_vulnerability_scan.assert_any_call(kind=kind, op=op, args=args)
 
         os.path.realpath(b"te2st/test2")
         op = "os.path.join"
@@ -34,7 +35,8 @@ def test_ospath_commands():
 
         op = "os.path.getsize"
         args = (path1,)
-        mock_run_vulnerability_scan.assert_called_with(kind=kind, op=op, args=args)
+        # Need to use assert_any_call, since python 3.12 it uses os.path.join
+        mock_run_vulnerability_scan.assert_any_call(kind=kind, op=op, args=args)
 
 
 def test_ospath_command_absolute_path():
@@ -65,14 +67,16 @@ def test_ospath_expanduser():
         os.path.expanduser("../test/test2")
         op = "os.path.expanduser"
         args = ("../test/test2",)
-        mock_run_vulnerability_scan.assert_called_with(kind=kind, op=op, args=args)
+        # Need to use assert_any_call, since python 3.12 it uses os.path.join
+        mock_run_vulnerability_scan.assert_any_call(kind=kind, op=op, args=args)
 
         path1 = Path("./test", "test2", "test3")
         os.path.expanduser(path1)
 
         op = "os.path.expanduser"
         args = (path1,)
-        mock_run_vulnerability_scan.assert_called_with(kind=kind, op=op, args=args)
+        # Need to use assert_any_call, since python 3.12 it uses os.path.join
+        mock_run_vulnerability_scan.assert_any_call(kind=kind, op=op, args=args)
 
 
 def test_ospath_expandvars():