Skip to content

Commit 96ba34f

Browse files
committed
Only write diff file if there are differences.
Signed-off-by: Caroline Russell <[email protected]>
1 parent 8dcd13d commit 96ba34f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.github/workflows/snapshot_tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ jobs:
5050
- name: Get original snapshots
5151
run: |
5252
git clone https://github.com/AppThreat/dep-scan-snapshots.git /home/runner/work/original_snapshots
53-
cd /home/runner/work/original_snapshots
54-
git checkout 51fd3f3f63e8aad258b9b10b38d7222000cc36e7
5553
5654
- name: Generate snapshots and test
5755
env:

test/snapshots.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
23

34
import argparse
45
import logging
@@ -124,17 +125,17 @@ def generate_snapshot_diffs(dir1: str, dir2: str, projects: List, v5: bool):
124125
bom_diff_options.file_2 = f"{dir2}/{p}-bom.vdr.json"
125126
bom_diff_options.output = f"{dir2}/{p}-bom-diff.json"
126127
bom_result, bom_summary = compare_snapshots(bom_diff_options, v5, p)
127-
if bom_result:
128-
print(bom_result)
128+
print(bom_result)
129+
if bom_result.endswith("failed."):
129130
failed_diffs["bom"] |= {p: bom_summary}
130131
csaf_diff_options.file_1 = f"{dir1}/{p}.csaf_v1.json"
131132
csaf_diff_options.file_2 = f"{dir2}/{p}.csaf_v1.json"
132133
csaf_diff_options.output = f"{dir2}/{p}.csaf-diff.json"
133134
csaf_result, csaf_summary = compare_snapshots(csaf_diff_options, v5, p)
134-
if csaf_result:
135-
print(csaf_result)
135+
print(csaf_result)
136+
if csaf_result.endswith("failed."):
136137
failed_diffs["csaf"] |= {p: csaf_summary}
137-
return failed_diffs
138+
return {k: v for k, v in failed_diffs.items() if v}
138139

139140

140141
def handle_legacy_output(data: Dict, options: Options, filename: str) -> Dict:

0 commit comments

Comments
 (0)