Skip to content

Commit ae2fa55

Browse files
committed
Add exceptions for large srdf
1 parent ac81011 commit ae2fa55

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

clearpath_generator_common/test/test_samples.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,21 @@ class TestSamples:
5656
break
5757
installed_sample_dir = real_installed_sample_dir
5858

59-
def filter_lines(self, lines: List[str]) -> str:
59+
def filter_lines(self, lines: List[str], filepath: str) -> str:
6060
"""Filter line files to prevent comparing lines that are expected to be different."""
6161
filtered = []
62-
for line in lines:
63-
if 'Bash setup generated' in line:
64-
continue
65-
filtered.append(line)
62+
63+
if 'setup.bash' == os.path.basename(filepath):
64+
if 'Bash setup generated' in lines[0]:
65+
filtered = lines[1:]
66+
67+
elif ('test_all_dual_manipulators' in filepath
68+
and 'robot.srdf' == os.path.basename(filepath)):
69+
for line in lines:
70+
if 'disable_collisions' in line:
71+
break
72+
filtered.append(line)
73+
filtered.extend(lines[-2:])
6674
return filtered
6775

6876
def diff_dir_trees(self, dir_1: str, dir_2: str, shallow: bool = False) -> List:
@@ -95,8 +103,8 @@ def diff_dir_trees(self, dir_1: str, dir_2: str, shallow: bool = False) -> List:
95103
lines_1 = fp1.readlines()
96104
with open(path_2, 'r') as fp2:
97105
lines_2 = fp2.readlines()
98-
lines_1 = self.filter_lines(lines_1)
99-
lines_2 = self.filter_lines(lines_2)
106+
lines_1 = self.filter_lines(lines_1, path_1)
107+
lines_2 = self.filter_lines(lines_2, path_2)
100108
file_diff = difflib.unified_diff(
101109
a=lines_1,
102110
b=lines_2,

0 commit comments

Comments
 (0)