mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-10-18 09:58:43 +00:00
Code Releases Activity

Flock tests: parallel tests displaying results correctly

Browse Source
This commit is contained in:
Maria Matejka 2024-07-26 16:13:26 +02:00
parent 01552774c2
commit c1bfc76a35
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
python/BIRD/Test.py
View File

@ -208,15 +208,29 @@ class DumpCheck:
raise Exception("Invalid test mode") raise Exception("Invalid test mode")
def __call__(self): def __call__(self):
print(f"{self.stem}\t", end="", flush=True) padlen = 48 - len(self.stem)
if padlen < 6:
padlen = 6
label = self.stem + " "*padlen
print(label)
self.label_col = len(label)
self.label_row = len(self.test.checks_running)
self.test.checks_running.append(self)
return self.run() return self.run()
def print_result(self, text):
rows_up = len(self.test.checks_running) - self.label_row
total_chars = len(text) + self.label_col
print(f"\033[{rows_up}A\033[{self.label_col}C{text}\033[{total_chars}D\033[{rows_up}B", flush=True, end="")
async def save(self): async def save(self):
await asyncio.sleep(self.timeout) await asyncio.sleep(self.timeout)
dump = await self.obtain() dump = await self.obtain()
with open(self.file, "w") as y: with open(self.file, "w") as y:
yaml.dump(dump, y) yaml.dump(dump, y)
print(f"[ SAVED ]") self.print_result(f"[ SAVED ]")
async def check(self): async def check(self):
with open(self.file, "r") as y: with open(self.file, "r") as y:
@ -231,7 +245,7 @@ class DumpCheck:
deep_eq(c, dump, True) deep_eq(c, dump, True)
# if deep_eq(c, dump): # if deep_eq(c, dump):
spent = asyncio.get_running_loop().time() - to.when() + self.check_timeout spent = asyncio.get_running_loop().time() - to.when() + self.check_timeout
print(f"[ OOK ]\t{spent:.6f}s") self.print_result(f"[ OK ] {spent:.6f}s")
return True return True
except Differs as d: except Differs as d:
if self.show_difs: if self.show_difs:
@ -241,7 +255,7 @@ class DumpCheck:
await asyncio.sleep(self.check_retry_timeout) await asyncio.sleep(self.check_retry_timeout)
except TimeoutError as e: except TimeoutError as e:
print(f"[ BAD ]") self.print_result(f"[ BAD ]")
for q in range(len(seen)): for q in range(len(seen)):
with open(f"__result_bad_{q}__{self.stem}", "w") as y: with open(f"__result_bad_{q}__{self.stem}", "w") as y:
yaml.dump(seen[q], y) yaml.dump(seen[q], y)
@ -335,11 +349,11 @@ class Test:
self.background_tasks = [] self.background_tasks = []
self.checks_running = []
self.ipv6_pxgen = self.ipv6_prefix.subnets(new_prefix=self.ipv6_link_pxlen) self.ipv6_pxgen = self.ipv6_prefix.subnets(new_prefix=self.ipv6_link_pxlen)
self.ipv4_pxgen = self.ipv4_prefix.subnets(new_prefix=self.ipv4_link_pxlen) self.ipv4_pxgen = self.ipv4_prefix.subnets(new_prefix=self.ipv4_link_pxlen)
self.route_dump_id = 0
async def assure_running(self): async def assure_running(self):
if self._stopped is not None: if self._stopped is not None:
return return