Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Commit 311f60f

Browse files
abbytizabbytiz
committed
Merge branch 'master' into ReadmeUpdates
2 parents 68dca05 + caee6e4 commit 311f60f

8 files changed

+142
-78
lines changed

‎differs/pipDiff.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ func (d PipDiffer) getPackages(image utils.Image) (map[string]map[string]utils.P
111111
continue
112112
}
113113
currPackage := utils.PackageInfo{Version: version, Size: size}
114-
addToMap(packages, packageName, pythonPath, currPackage)
114+
mapPath := strings.Replace(pythonPath, path, "", 1)
115+
addToMap(packages, packageName, mapPath, currPackage)
115116
}
116117
}
117118
}

‎differs/pipDiff_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ func TestGetPythonPackages(t *testing.T) {
7878
},
7979
expectedPackages: map[string]map[string]utils.PackageInfo{
8080
"packageone": {
81-
"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"},
82-
"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python2.7/site-packages": {Version: "0.1.1", Size: "0"},
81+
"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"},
82+
"/usr/local/lib/python2.7/site-packages": {Version: "0.1.1", Size: "0"},
8383
},
84-
"packagetwo": {"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
85-
"script1": {"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: "0"}},
86-
"script2": {"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: "0"}},
87-
"script3": {"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python2.7/site-packages": {Version: "3.0", Size: "0"}},
84+
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
85+
"script1": {"/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: "0"}},
86+
"script2": {"/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: "0"}},
87+
"script3": {"/usr/local/lib/python2.7/site-packages": {Version: "3.0", Size: "0"}},
8888
},
8989
},
9090
{
@@ -93,10 +93,10 @@ func TestGetPythonPackages(t *testing.T) {
9393
FSPath: "testDirs/pipTests/packagesSingleVersion",
9494
},
9595
expectedPackages: map[string]map[string]utils.PackageInfo{
96-
"packageone": {"testDirs/pipTests/packagesSingleVersion/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
97-
"packagetwo": {"testDirs/pipTests/packagesSingleVersion/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
98-
"script1": {"testDirs/pipTests/packagesSingleVersion/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: "0"}},
99-
"script2": {"testDirs/pipTests/packagesSingleVersion/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: "0"}},
96+
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
97+
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
98+
"script1": {"/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: "0"}},
99+
"script2": {"/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: "0"}},
100100
},
101101
},
102102
{
@@ -110,11 +110,11 @@ func TestGetPythonPackages(t *testing.T) {
110110
},
111111
},
112112
expectedPackages: map[string]map[string]utils.PackageInfo{
113-
"packageone": {"testDirs/pipTests/pythonPathTests/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
114-
"packagetwo": {"testDirs/pipTests/pythonPathTests/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
115-
"packagefive": {"testDirs/pipTests/pythonPathTests/pythonPath2/subdir": {Version: "3.6.9", Size: "0"}},
116-
"packagesix": {"testDirs/pipTests/pythonPathTests/pythonPath1": {Version: "3.6.9", Size: "0"}},
117-
"packageseven": {"testDirs/pipTests/pythonPathTests/pythonPath1": {Version: "4.6.2", Size: "0"}},
113+
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
114+
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
115+
"packagefive": {"/pythonPath2/subdir": {Version: "3.6.9", Size: "0"}},
116+
"packagesix": {"/pythonPath1": {Version: "3.6.9", Size: "0"}},
117+
"packageseven": {"/pythonPath1": {Version: "4.6.2", Size: "0"}},
118118
},
119119
},
120120
{
@@ -128,8 +128,8 @@ func TestGetPythonPackages(t *testing.T) {
128128
},
129129
},
130130
expectedPackages: map[string]map[string]utils.PackageInfo{
131-
"packageone": {"testDirs/pipTests/pythonPathTests/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
132-
"packagetwo": {"testDirs/pipTests/pythonPathTests/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
131+
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
132+
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
133133
},
134134
},
135135
}

‎tests/diff_comparisons.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ apt tests/apt_diff_actual.json tests/apt_diff_expected.json
44
node tests/node_diff_actual.json tests/node_diff_expected.json
55
node tests/node_diff_order_actual.json tests/node_diff_order_expected.json
66
multi tests/multi_diff_actual.json tests/multi_diff_expected.json
7+
history tests/hist_diff_actual.json tests/hist_diff_expected.json
8+
multihist tests/multi_hist_diff_actual.json tests/multi_hist_diff_expected.json

‎tests/differ_runs.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
-n node gcr.io/gcp-runtimes/node-base gcr.io/gcp-runtimes/node-modified tests/node_diff_actual.json
55
-n nodeOrder gcr.io/gcp-runtimes/node-modified:2.0 gcr.io/gcp-runtimes/node-modified tests/node_diff_order_actual.json
66
-npa multi gcr.io/gcp-runtimes/multi-base gcr.io/gcp-runtimes/multi-modified tests/multi_diff_actual.json
7+
-d history gcr.io/gcp-runtimes/diff-base gcr.io/gcp-runtimes/diff-modified tests/hist_diff_actual.json
8+
-pd multihist gcr.io/gcp-runtimes/pip-base gcr.io/gcp-runtimes/pip-modified tests/multi_hist_diff_actual.json

‎tests/hist_diff_expected.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
[
2+
{
3+
"DiffType": "HistoryDiffer",
4+
"Diff": {
5+
"Image1": "gcr.io/gcp-runtimes/diff-base",
6+
"Image2": "gcr.io/gcp-runtimes/diff-modified",
7+
"Adds": [
8+
"/bin/sh -c #(nop) ADD file:aa56bc8f2fea9c0c81ca085bfa273ad1a3b0d46f51b8c9c61b483340c902024f in /"
9+
],
10+
"Dels": [
11+
"/bin/sh -c #(nop) ADD file:5dde1d6e0f6362350d7ebbc85ce82cf4c5032fb74d2c6235dac172e8e102c00f in /",
12+
"mkdir /home/test"
13+
]
14+
}
15+
}
16+
]

‎tests/multi_diff_expected.json

Lines changed: 17 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"Image1": "gcr.io/gcp-runtimes/multi-base",
8686
"Packages1": {
8787
"pbr": {
88-
"multi-base/usr/local/lib/python3.6/site-packages": {
88+
"/usr/local/lib/python3.6/site-packages": {
8989
"Version": "3.1.1",
9090
"Size": "447110"
9191
}
@@ -94,58 +94,13 @@
9494
"Image2": "gcr.io/gcp-runtimes/multi-modified",
9595
"Packages2": {
9696
"retrying": {
97-
"multi-modified/usr/local/lib/python3.6/site-packages": {
97+
"/usr/local/lib/python3.6/site-packages": {
9898
"Version": "1.3.3",
9999
"Size": "9955"
100100
}
101101
}
102102
},
103103
"InfoDiff": [
104-
{
105-
"Package": "pip",
106-
"Info1": [
107-
{
108-
"Version": "9.0.1",
109-
"Size": "5289421"
110-
}
111-
],
112-
"Info2": [
113-
{
114-
"Version": "9.0.1",
115-
"Size": "5289421"
116-
}
117-
]
118-
},
119-
{
120-
"Package": "setuptools",
121-
"Info1": [
122-
{
123-
"Version": "36.2.2",
124-
"Size": "839895"
125-
}
126-
],
127-
"Info2": [
128-
{
129-
"Version": "36.2.2",
130-
"Size": "1157078"
131-
}
132-
]
133-
},
134-
{
135-
"Package": "six",
136-
"Info1": [
137-
{
138-
"Version": "1.10.0",
139-
"Size": "30098"
140-
}
141-
],
142-
"Info2": [
143-
{
144-
"Version": "1.10.0",
145-
"Size": "30098"
146-
}
147-
]
148-
},
149104
{
150105
"Package": "wheel",
151106
"Info1": [
@@ -175,6 +130,21 @@
175130
"Size": "73348"
176131
}
177132
]
133+
},
134+
{
135+
"Package": "setuptools",
136+
"Info1": [
137+
{
138+
"Version": "36.2.2",
139+
"Size": "839895"
140+
}
141+
],
142+
"Info2": [
143+
{
144+
"Version": "36.2.2",
145+
"Size": "1157078"
146+
}
147+
]
178148
}
179149
]
180150
}

‎tests/multi_hist_diff_expected.json

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
[
2+
{
3+
"DiffType": "HistoryDiffer",
4+
"Diff": {
5+
"Image1": "gcr.io/gcp-runtimes/pip-base",
6+
"Image2": "gcr.io/gcp-runtimes/pip-modified",
7+
"Adds": [
8+
"/bin/bash"
9+
],
10+
"Dels": []
11+
}
12+
},
13+
{
14+
"DiffType": "PipDiffer",
15+
"Diff": {
16+
"Image1": "gcr.io/gcp-runtimes/pip-base",
17+
"Packages1": {},
18+
"Image2": "gcr.io/gcp-runtimes/pip-modified",
19+
"Packages2": {
20+
"mock": {
21+
"/usr/local/lib/python3.6/site-packages": {
22+
"Version": "2.0.0",
23+
"Size": "504226"
24+
}
25+
},
26+
"pbr": {
27+
"/usr/local/lib/python3.6/site-packages": {
28+
"Version": "3.1.1",
29+
"Size": "447110"
30+
}
31+
},
32+
"six": {
33+
"/usr/local/lib/python3.6/site-packages": {
34+
"Version": "1.10.0",
35+
"Size": "30098"
36+
}
37+
}
38+
},
39+
"InfoDiff": [
40+
{
41+
"Package": "pip",
42+
"Info1": [
43+
{
44+
"Version": "9.0.1",
45+
"Size": "3741310"
46+
}
47+
],
48+
"Info2": [
49+
{
50+
"Version": "9.0.1",
51+
"Size": "5289421"
52+
}
53+
]
54+
},
55+
{
56+
"Package": "wheel",
57+
"Info1": [
58+
{
59+
"Version": "0.29.0",
60+
"Size": "103348"
61+
}
62+
],
63+
"Info2": [
64+
{
65+
"Version": "0.29.0",
66+
"Size": "103509"
67+
}
68+
]
69+
}
70+
]
71+
}
72+
}
73+
]

‎tests/pip_diff_expected.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,52 @@
77
"Image2": "gcr.io/gcp-runtimes/pip-modified",
88
"Packages2": {
99
"mock": {
10-
"pip-modified/usr/local/lib/python3.6/site-packages": {
10+
"/usr/local/lib/python3.6/site-packages": {
1111
"Version": "2.0.0",
1212
"Size": "504226"
1313
}
1414
},
1515
"pbr": {
16-
"pip-modified/usr/local/lib/python3.6/site-packages": {
16+
"/usr/local/lib/python3.6/site-packages": {
1717
"Version": "3.1.1",
1818
"Size": "447110"
1919
}
2020
},
2121
"six": {
22-
"pip-modified/usr/local/lib/python3.6/site-packages": {
22+
"/usr/local/lib/python3.6/site-packages": {
2323
"Version": "1.10.0",
2424
"Size": "30098"
2525
}
2626
}
2727
},
2828
"InfoDiff": [
2929
{
30-
"Package": "pip",
30+
"Package": "wheel",
3131
"Info1": [
3232
{
33-
"Version": "9.0.1",
34-
"Size": "3741310"
33+
"Version": "0.29.0",
34+
"Size": "103348"
3535
}
3636
],
3737
"Info2": [
3838
{
39-
"Version": "9.0.1",
40-
"Size": "5289421"
39+
"Version": "0.29.0",
40+
"Size": "103509"
4141
}
4242
]
4343
},
4444
{
45-
"Package": "wheel",
45+
"Package": "pip",
4646
"Info1": [
4747
{
48-
"Version": "0.29.0",
49-
"Size": "103348"
48+
"Version": "9.0.1",
49+
"Size": "3741310"
5050
}
5151
],
5252
"Info2": [
5353
{
54-
"Version": "0.29.0",
55-
"Size": "103509"
54+
"Version": "9.0.1",
55+
"Size": "5289421"
5656
}
5757
]
5858
}

0 commit comments

Comments
 (0)