'nixpkgs',
'programs.sqlite',
'svn-revision']
- benign_errors = []
+ permitted_errors = [
+ 'pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/foo.nix',
+ ]
+ benign_expected_errors = []
+ benign_permitted_errors = []
for ee in expected_errors:
if ee in errors:
errors.remove(ee)
- benign_errors.append(ee)
+ benign_expected_errors.append(ee)
+ for pe in permitted_errors:
+ if pe in errors:
+ errors.remove(pe)
+ benign_permitted_errors.append(ee)
v.check(
f'{len(errors)} unexpected incomparable files: {errors}',
len(errors) == 0)
v.check(
- f'({len(benign_errors)} of {len(expected_errors)} expected incomparable files)',
- len(benign_errors) == len(expected_errors))
+ f'({len(benign_expected_errors)} of {len(expected_errors)} expected incomparable files)',
+ len(benign_expected_errors) == len(expected_errors))
+ v.check(
+ f'({len(benign_permitted_errors)} of {len(permitted_errors)} permitted incomparable files)',
+ len(benign_permitted_errors) <= len(permitted_errors))
def extract_tarball(