Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/diff_comparisons.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ apt tests/apt_diff_actual.json tests/apt_diff_expected.json
node tests/node_diff_actual.json tests/node_diff_expected.json
node tests/node_diff_order_actual.json tests/node_diff_order_expected.json
multi tests/multi_diff_actual.json tests/multi_diff_expected.json
history tests/hist_diff_actual.json tests/hist_diff_expected.json
multihist tests/multi_hist_diff_actual.json tests/multi_hist_diff_expected.json
2 changes: 2 additions & 0 deletions tests/differ_runs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
-n node gcr.io/gcp-runtimes/node-base gcr.io/gcp-runtimes/node-modified tests/node_diff_actual.json
-n nodeOrder gcr.io/gcp-runtimes/node-modified:2.0 gcr.io/gcp-runtimes/node-modified tests/node_diff_order_actual.json
-npa multi gcr.io/gcp-runtimes/multi-base gcr.io/gcp-runtimes/multi-modified tests/multi_diff_actual.json
-d history gcr.io/gcp-runtimes/diff-base gcr.io/gcp-runtimes/diff-modified tests/hist_diff_actual.json
-pd multihist gcr.io/gcp-runtimes/pip-base gcr.io/gcp-runtimes/pip-modified tests/multi_hist_diff_actual.json
16 changes: 16 additions & 0 deletions tests/hist_diff_expected.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[
{
"DiffType": "HistoryDiffer",
"Diff": {
"Image1": "gcr.io/gcp-runtimes/diff-base",
"Image2": "gcr.io/gcp-runtimes/diff-modified",
"Adds": [
"/bin/sh -c #(nop) ADD file:aa56bc8f2fea9c0c81ca085bfa273ad1a3b0d46f51b8c9c61b483340c902024f in /"
],
"Dels": [
"/bin/sh -c #(nop) ADD file:5dde1d6e0f6362350d7ebbc85ce82cf4c5032fb74d2c6235dac172e8e102c00f in /",
"mkdir /home/test"
]
}
}
]
73 changes: 73 additions & 0 deletions tests/multi_hist_diff_expected.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
[
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rerun for pip diff changes but otherwise lgtm

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, and fixed the pip differ and tests so that the path is only what is necessary.

{
"DiffType": "HistoryDiffer",
"Diff": {
"Image1": "gcr.io/gcp-runtimes/pip-base",
"Image2": "gcr.io/gcp-runtimes/pip-modified",
"Adds": [
"/bin/bash"
],
"Dels": []
}
},
{
"DiffType": "PipDiffer",
"Diff": {
"Image1": "gcr.io/gcp-runtimes/pip-base",
"Packages1": {},
"Image2": "gcr.io/gcp-runtimes/pip-modified",
"Packages2": {
"mock": {
"python3.6": {
"Version": "2.0.0",
"Size": "504226"
}
},
"pbr": {
"python3.6": {
"Version": "3.1.1",
"Size": "447110"
}
},
"six": {
"python3.6": {
"Version": "1.10.0",
"Size": "30098"
}
}
},
"InfoDiff": [
{
"Package": "pip",
"Info1": [
{
"Version": "9.0.1",
"Size": "3741310"
}
],
"Info2": [
{
"Version": "9.0.1",
"Size": "5289421"
}
]
},
{
"Package": "wheel",
"Info1": [
{
"Version": "0.29.0",
"Size": "103348"
}
],
"Info2": [
{
"Version": "0.29.0",
"Size": "103509"
}
]
}
]
}
}
]