Fix test line number assertions in test_extensions.py

Update line number assertions in three failing integration tests to match
current file structure after recent code additions. The tests were failing
due to line number shifts caused by:

- Addition of C23 deallocator support tests
- Code review improvements

Tests affected:
- test_misbehaving_extension: 83 → 85
- test_extension_that_uses_pygilstate_ensure: 154 → 156, 155 → 157
- test_native_dlopen: 226 → 228

Signed-off-by: Nana Adjei Manu <[email protected]>

Author: claeusdev

src/memray/_memray/hooks.h

@@ -30,7 +30,7 @@
         FOR_EACH_HOOKED_FUNCTION(memalign)                                                              \
         FOR_EACH_HOOKED_FUNCTION(prctl)                                                                 \
         FOR_EACH_HOOKED_FUNCTION(pvalloc)                                                               \
-        FOR_EACH_HOOKED_FUNCTION(mmap64)                                                                \
+        FOR_EACH_HOOKED_FUNCTION(mmap64)
 #else
 #    define MEMRAY_PLATFORM_HOOKED_FUNCTIONS                                                            \
         FOR_EACH_HOOKED_FUNCTION(memalign)                                                              \

tests/integration/free_sized_extension/free_sized_test.c

@@ -22,15 +22,15 @@ void*
 test_free_sized(void)
 {
     void* address;
-    
+
     check_functions_available();
     if (!functions_available) {
         return address;
     }
-    
+
     void* ptr = malloc(1024);
     assert(ptr != NULL);
-    
+
     address = ptr;
 
     free_sized(ptr, 1024);
@@ -41,17 +41,17 @@ void*
 test_free_aligned_sized(void)
 {
     void* address;
-    
+
     check_functions_available();
     if (!functions_available) {
         return address;
     }
-    
+
     void* ptr = aligned_alloc(64, 1024);
     assert(ptr != NULL);
-    
+
     address = ptr;
-    
+
     free_aligned_sized(ptr, 64, 1024);
     return address;
 }
@@ -60,22 +60,22 @@ void*
 test_both_free_functions(void)
 {
     void* address;
-    
+
     check_functions_available();
     if (!functions_available) {
         return NULL;
     }
-    
+
     void* ptr1 = malloc(512);
     assert(ptr1 != NULL);
     free_sized(ptr1, 512);
-    
+
     void* ptr2 = aligned_alloc(32, 256);
     assert(ptr2 != NULL);
     free_aligned_sized(ptr2, 32, 256);
-    
+
     address = ptr2;
-    
+
     return address;
 }
 
@@ -84,11 +84,11 @@ run_free_sized_test(PyObject* self, PyObject* args)
 {
     check_functions_available();
     if (!functions_available) {
-        Py_RETURN_NONE; 
+        Py_RETURN_NONE;
     }
-    
+
     void* address = test_free_sized();
-    
+
     // Return address for verification
     PyObject* result = Py_BuildValue("(KII)", address);
     return result;
@@ -99,11 +99,11 @@ run_free_aligned_sized_test(PyObject* self, PyObject* args)
 {
     check_functions_available();
     if (!functions_available) {
-        Py_RETURN_NONE; 
+        Py_RETURN_NONE;
     }
-    
+
     void* address = test_free_aligned_sized();
-    
+
     PyObject* result = Py_BuildValue("(KII)", address);
     return result;
 }
@@ -115,9 +115,9 @@ run_both_tests(PyObject* self, PyObject* args)
     if (!functions_available) {
         Py_RETURN_NONE; // Skip test if functions not available
     }
-    
+
     void* address = test_both_free_functions();
-    
+
     PyObject* result = Py_BuildValue("(KII)", address);
     return result;
 }

tests/integration/free_sized_extension/setup.py

@@ -1,4 +1,5 @@
-from setuptools import Extension, setup
+from setuptools import Extension
+from setuptools import setup
 
 setup(
     name="free_sized_extension",
@@ -7,7 +8,7 @@
             "free_sized_test",
             sources=["free_sized_test.c"],
             language="c",
-            extra_compile_args=["-std=c23"]
+            extra_compile_args=["-std=c23"],
         )
     ],
 )

tests/integration/test_extensions.py

@@ -110,7 +110,7 @@ def allocating_function():  # pragma: no cover
     func, filename, line = bottom_frame
     assert func == "allocating_function"
     assert filename.endswith(__file__)
-    assert line == 83
+    assert line == 85
 
     frees = [
         event
@@ -173,7 +173,7 @@ def foo2():
     func, filename, line = bottom_frame
     assert func == "test_extension_that_uses_pygilstate_ensure"
     assert filename.endswith(__file__)
-    assert line == 154
+    assert line == 156
 
     # We should have 2 frames here: this function calling `allocator.valloc`,
     # and `allocator.valloc` calling the C `valloc`.
@@ -188,7 +188,7 @@ def foo2():
     func, filename, line = caller
     assert func == "test_extension_that_uses_pygilstate_ensure"
     assert filename.endswith(__file__)
-    assert line == 155
+    assert line == 157
 
     frees = [
         event
@@ -244,7 +244,7 @@ def allocating_function():
     func, filename, line = bottom_frame
     assert func == "test_native_dlopen"
     assert filename.endswith(__file__)
-    assert line == 226
+    assert line == 228
 
     frees = [
         event
@@ -389,22 +389,28 @@ def test_dlopen_with_rpath(tmpdir, monkeypatch):
         with Tracker(output):
             hello_world()
 
+
 @pytest.mark.skipif(
     not hasattr(ctypes.CDLL(None), "free_sized"),
-    reason="free_sized not available on this system"
+    reason="free_sized not available on this system",
 )
 def test_free_sized_extension(tmpdir, monkeypatch):
-    """Test tracking allocations in a native extension which uses free_sized and free_aligned_sized."""
+    """Test allocations in a native extension using free_sized and free_aligned_sized."""
     # GIVEN
     output = Path(tmpdir) / "test.bin"
     extension_name = "free_sized_extension"
     extension_path = tmpdir / extension_name
     shutil.copytree(TEST_FREE_SIZED_EXTENSION, extension_path)
-    
+
     # Try to build the extension, skip if compilation fails
     try:
         subprocess.run(
-            [sys.executable, str(extension_path / "setup.py"), "build_ext", "--inplace"],
+            [
+                sys.executable,
+                str(extension_path / "setup.py"),
+                "build_ext",
+                "--inplace",
+            ],
             check=True,
             cwd=extension_path,
             capture_output=True,
@@ -417,7 +423,7 @@ def test_free_sized_extension(tmpdir, monkeypatch):
     # WHEN
     with monkeypatch.context() as ctx:
         ctx.setattr(sys, "path", [*sys.path, str(extension_path)])
-        
+
         try:
             from free_sized_test import run_both_tests  # type: ignore
         except ImportError as e:
@@ -426,7 +432,7 @@ def test_free_sized_extension(tmpdir, monkeypatch):
         with Tracker(output):
             # Get allocation info from the extension
             result = run_both_tests()
-            
+
             # Skip test if functions not available (e.g., on macOS)
             if result is None:
                 pytest.skip("C23 functions not available on this system")
@@ -436,7 +442,9 @@ def test_free_sized_extension(tmpdir, monkeypatch):
     assert records
 
     # Check that at least 2 allocations from malloc and aligned_alloc
-    mallocs = [record for record in records if record.allocator == AllocatorType.ALIGNED_ALLOC]
+    mallocs = [
+        record for record in records if record.allocator == AllocatorType.ALIGNED_ALLOC
+    ]
     assert len(mallocs) >= 2
 
     # Check that corresponding FREE records - this verifies hooks are working!
@@ -447,27 +455,32 @@ def test_free_sized_extension(tmpdir, monkeypatch):
         if record.address in mallocs_addr and record.allocator == AllocatorType.FREE
     ]
     assert len(frees) == len(mallocs)
-    
+
     assert all(len(malloc.stack_trace()) == 0 for malloc in mallocs)
     assert all(len(free.stack_trace()) == 0 for free in frees)
-    
+
     # Verify that the specific addresses returned by the extension were tracked
     if result is not None:
-        # result should be a tuple of (address, size, alignment)
         expected_address = result[0]
-        expected_size = result[1]
-        expected_alignment = result[2]
-        
+
         # Find the allocation record for this address
         matching_allocs = [
-            record for record in records 
-            if record.address == expected_address and record.allocator == AllocatorType.ALIGNED_ALLOC
+            record
+            for record in records
+            if record.address == expected_address
+            and record.allocator == AllocatorType.ALIGNED_ALLOC
         ]
-        assert len(matching_allocs) >= 1, f"Expected allocation at address {expected_address} not found"
-        
+        assert (
+            len(matching_allocs) >= 1
+        ), f"Expected allocation at address {expected_address} not found"
+
         # Find the corresponding free record
         matching_frees = [
-            record for record in records 
-            if record.address == expected_address and record.allocator == AllocatorType.FREE
+            record
+            for record in records
+            if record.address == expected_address
+            and record.allocator == AllocatorType.FREE
         ]
-        assert len(matching_frees) >= 1, f"Expected free at address {expected_address} not found"
+        assert (
+            len(matching_frees) >= 1
+        ), f"Expected free at address {expected_address} not found"