From d9634a9bf53a6cc54a48fc688f4003a403adfc7c Mon Sep 17 00:00:00 2001 From: Simon Billinge Date: Wed, 1 Nov 2023 17:16:48 -0400 Subject: [PATCH] passing all builder tests --- tests/test_builders.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/test_builders.py b/tests/test_builders.py index db43092a2..11237a632 100644 --- a/tests/test_builders.py +++ b/tests/test_builders.py @@ -268,7 +268,7 @@ def mockreturn(*args, **kwargs): actual = openpyxl.load_workbook(actual_file)["T&B"] actual = [str(actual[b]) for b in xls_check] elif bm == "recent-collabs": - if 'nsf' in actual_file: + if 'nsf' in actual_file.name: sheet = "NSF COA Template" else: sheet = "Collaborators" @@ -287,11 +287,12 @@ def mockreturn(*args, **kwargs): else: with open(actual_file, "r") as f: actual = f.read() + if bm == "reimb": expected = openpyxl.load_workbook(file)["T&B"] expected = [str(expected[b]) for b in xls_check] elif bm == "recent-collabs": - if 'nsf' in file: + if 'nsf' in file.name: sheet = "NSF COA Template" else: sheet = "Collaborators"