From e1df3fa83df59a2bed649b81109e8862fd446509 Mon Sep 17 00:00:00 2001
From: pompolic <pompolic@special-circumstanc.es>
Date: Thu, 27 Apr 2023 20:54:51 +0200
Subject: [PATCH] Fix some erroring tests
---
gdb-port/tests/unit/top-level-parse.py | 27 +++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/gdb-port/tests/unit/top-level-parse.py b/gdb-port/tests/unit/top-level-parse.py
index 9c67ae1..837d110 100644
--- a/gdb-port/tests/unit/top-level-parse.py
+++ b/gdb-port/tests/unit/top-level-parse.py
@@ -89,10 +89,11 @@ class TopLevelParseStateManagement(unittest.TestCase):
self.top_level_parse.enter_h_arena_malloc_raw(256)
self.assertEqual(self.parser1.bytes_used[int(self._arena.address)], 256)
+ # TODO: skip this test when tracking allocations via Hammer stats
def test_enter_h_arena_malloc_raw(self):
self.top_level_parse.parser_stacks.append(self.ps1)
self.top_level_parse.parser_objs[32] = self.parser1
- self.ps1.push(self.parser1)
+ self.ps1.push(self.parser1, self._arena)
self.top_level_parse.enter_h_arena_malloc_raw(256)
self.assertEqual(self.top_level_parse.parser_stacks[-1].p_stack[-1].bytes_used[int(self._arena.address)], 256)
@@ -120,23 +121,23 @@ class TopLevelParseStateManagement(unittest.TestCase):
def test_peek_parser(self):
self.top_level_parse.parser_stacks.append(self.ps1)
self.top_level_parse.parser_objs[32] = self.parser1
- self.ps1.push(self.parser1)
+ self.ps1.push(self.parser1, self._arena)
parser1 = self.top_level_parse.peek_parser()
self.assertIs(parser1, self.parser1)
def test_parser_by_address(self):
self.top_level_parse.parser_stacks.append(self.ps1)
self.top_level_parse.parser_objs[32] = self.parser1
- self.ps1.push(self.parser1)
+ self.ps1.push(self.parser1, self._arena)
parser1 = self.top_level_parse.parser_by_address(32)
def test_parsers_by_name(self):
self.top_level_parse.parser_stacks.append(self.ps1)
self.top_level_parse.parser_objs[32] = self.parser1
- self.ps1.push(self.parser1)
+ self.ps1.push(self.parser1, self._arena)
parser2 = Parser("foo", 48)
self.top_level_parse.parser_objs[48] = parser2
- self.ps1.push(parser2)
+ self.ps1.push(parser2, self._arena)
parserlist = self.top_level_parse.parsers_by_name("foo")
self.assertEqual(parserlist, [self.parser1, parser2])
@@ -154,10 +155,10 @@ class TopLevelParseStateManagement(unittest.TestCase):
def test_get_parser_top_per_arena_mem(self):
self.top_level_parse.parser_stacks.append(self.ps1)
self.top_level_parse.parser_objs[32] = self.parser1
- self.ps1.push(self.parser1)
+ self.ps1.push(self.parser1. self._arena)
parser2 = Parser("bar", 48)
self.top_level_parse.parser_objs[48] = parser2
- self.ps1.push(parser2)
+ self.ps1.push(parser2, self._arena)
self.parser1.add_mem_use(16, 50)
parser2.add_mem_use(16, 60)
self.assertIs(self.top_level_parse.get_parser_top_per_arena_mem(), parser2)
@@ -165,10 +166,10 @@ class TopLevelParseStateManagement(unittest.TestCase):
def test_get_parser_top_total_arena_mem(self):
self.top_level_parse.parser_stacks.append(self.ps1)
self.top_level_parse.parser_objs[32] = self.parser1
- self.ps1.push(self.parser1)
+ self.ps1.push(self.parser1, self._arena)
parser2 = Parser("bar", 48)
self.top_level_parse.parser_objs[48] = parser2
- self.ps1.push(parser2)
+ self.ps1.push(parser2, self._arena)
self.parser1.add_mem_use(16, 50)
self.parser1.add_mem_use(128, 50)
parser2.add_mem_use(16, 60)
@@ -177,10 +178,10 @@ class TopLevelParseStateManagement(unittest.TestCase):
def test_get_avg_mem_use_per_arena(self):
self.top_level_parse.parser_stacks.append(self.ps1)
self.top_level_parse.parser_objs[32] = self.parser1
- self.ps1.push(self.parser1)
+ self.ps1.push(self.parser1, self._arena)
parser2 = Parser("bar", 48)
self.top_level_parse.parser_objs[48] = parser2
- self.ps1.push(parser2)
+ self.ps1.push(parser2, self._arena)
self.parser1.add_mem_use(16, 50)
self.parser1.add_mem_use(128, 50)
parser2.add_mem_use(16, 60)
@@ -189,10 +190,10 @@ class TopLevelParseStateManagement(unittest.TestCase):
def test_dump_memory_stats(self):
self.top_level_parse.parser_stacks.append(self.ps1)
self.top_level_parse.parser_objs[32] = self.parser1
- self.ps1.push(self.parser1)
+ self.ps1.push(self.parser1, self._arena)
parser2 = Parser("bar", 48)
self.top_level_parse.parser_objs[48] = parser2
- self.ps1.push(parser2)
+ self.ps1.push(parser2, self._arena)
self.parser1.add_mem_use(16, 50)
self.parser1.add_mem_use(128, 50)
parser2.add_mem_use(16, 60)
--
GitLab