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

History integ tests #14

Merged
merged 3 commits into from
Aug 11, 2017
Merged

History integ tests #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ffb94a
Adding back history integration tests
abbytiz Aug 10, 2017
3d2bb84
Re-generating test with updated pip differ
abbytiz Aug 10, 2017
522623f
Merge remote-tracking branch 'origin/master' into historyIntegTests
abbytiz Aug 11, 2017
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
Prev Previous commit
Merge remote-tracking branch 'origin/master' into historyIntegTests
  • Loading branch information
@abbytiz
abbytiz committed Aug 11, 2017
commit 522623f95ddfffd6703863ab86e688fb747a4de4
3 changes: 2 additions & 1 deletion differs/pipDiff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ func (d PipDiffer) getPackages(image utils.Image) (map[string]map[string]utils.P
continue
}
currPackage := utils.PackageInfo{Version: version, Size: size}
addToMap(packages, packageName, pythonPath, currPackage)
mapPath := strings.Replace(pythonPath, path, "", 1)
addToMap(packages, packageName, mapPath, currPackage)
}
}
}
Expand Down
34 changes: 17 additions & 17 deletions differs/pipDiff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@ func TestGetPythonPackages(t *testing.T) {
},
expectedPackages: map[string]map[string]utils.PackageInfo{
"packageone": {
"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"},
"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python2.7/site-packages": {Version: "0.1.1", Size: "0"},
"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"},
"/usr/local/lib/python2.7/site-packages": {Version: "0.1.1", Size: "0"},
},
"packagetwo": {"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
"script1": {"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: "0"}},
"script2": {"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: "0"}},
"script3": {"testDirs/pipTests/packagesMultiVersion/usr/local/lib/python2.7/site-packages": {Version: "3.0", Size: "0"}},
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
"script1": {"/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: "0"}},
"script2": {"/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: "0"}},
"script3": {"/usr/local/lib/python2.7/site-packages": {Version: "3.0", Size: "0"}},
},
},
{
Expand All @@ -93,10 +93,10 @@ func TestGetPythonPackages(t *testing.T) {
FSPath: "testDirs/pipTests/packagesSingleVersion",
},
expectedPackages: map[string]map[string]utils.PackageInfo{
"packageone": {"testDirs/pipTests/packagesSingleVersion/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
"packagetwo": {"testDirs/pipTests/packagesSingleVersion/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
"script1": {"testDirs/pipTests/packagesSingleVersion/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: "0"}},
"script2": {"testDirs/pipTests/packagesSingleVersion/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: "0"}},
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
"script1": {"/usr/local/lib/python3.6/site-packages": {Version: "1.0", Size: "0"}},
"script2": {"/usr/local/lib/python3.6/site-packages": {Version: "2.0", Size: "0"}},
},
},
{
Expand All @@ -110,11 +110,11 @@ func TestGetPythonPackages(t *testing.T) {
},
},
expectedPackages: map[string]map[string]utils.PackageInfo{
"packageone": {"testDirs/pipTests/pythonPathTests/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
"packagetwo": {"testDirs/pipTests/pythonPathTests/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
"packagefive": {"testDirs/pipTests/pythonPathTests/pythonPath2/subdir": {Version: "3.6.9", Size: "0"}},
"packagesix": {"testDirs/pipTests/pythonPathTests/pythonPath1": {Version: "3.6.9", Size: "0"}},
"packageseven": {"testDirs/pipTests/pythonPathTests/pythonPath1": {Version: "4.6.2", Size: "0"}},
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
"packagefive": {"/pythonPath2/subdir": {Version: "3.6.9", Size: "0"}},
"packagesix": {"/pythonPath1": {Version: "3.6.9", Size: "0"}},
"packageseven": {"/pythonPath1": {Version: "4.6.2", Size: "0"}},
},
},
{
Expand All @@ -128,8 +128,8 @@ func TestGetPythonPackages(t *testing.T) {
},
},
expectedPackages: map[string]map[string]utils.PackageInfo{
"packageone": {"testDirs/pipTests/pythonPathTests/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
"packagetwo": {"testDirs/pipTests/pythonPathTests/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
"packageone": {"/usr/local/lib/python3.6/site-packages": {Version: "3.6.9", Size: "0"}},
"packagetwo": {"/usr/local/lib/python3.6/site-packages": {Version: "4.6.2", Size: "0"}},
},
},
}
Expand Down
64 changes: 17 additions & 47 deletions tests/multi_diff_expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"Image1": "gcr.io/gcp-runtimes/multi-base",
"Packages1": {
"pbr": {
"multi-base/usr/local/lib/python3.6/site-packages": {
"/usr/local/lib/python3.6/site-packages": {
"Version": "3.1.1",
"Size": "447110"
}
Expand All @@ -94,58 +94,13 @@
"Image2": "gcr.io/gcp-runtimes/multi-modified",
"Packages2": {
"retrying": {
"multi-modified/usr/local/lib/python3.6/site-packages": {
"/usr/local/lib/python3.6/site-packages": {
"Version": "1.3.3",
"Size": "9955"
}
}
},
"InfoDiff": [
{
"Package": "pip",
"Info1": [
{
"Version": "9.0.1",
"Size": "5289421"
}
],
"Info2": [
{
"Version": "9.0.1",
"Size": "5289421"
}
]
},
{
"Package": "setuptools",
"Info1": [
{
"Version": "36.2.2",
"Size": "839895"
}
],
"Info2": [
{
"Version": "36.2.2",
"Size": "1157078"
}
]
},
{
"Package": "six",
"Info1": [
{
"Version": "1.10.0",
"Size": "30098"
}
],
"Info2": [
{
"Version": "1.10.0",
"Size": "30098"
}
]
},
{
"Package": "wheel",
"Info1": [
Expand Down Expand Up @@ -175,6 +130,21 @@
"Size": "73348"
}
]
},
{
"Package": "setuptools",
"Info1": [
{
"Version": "36.2.2",
"Size": "839895"
}
],
"Info2": [
{
"Version": "36.2.2",
"Size": "1157078"
}
]
}
]
}
Expand Down
6 changes: 3 additions & 3 deletions tests/multi_hist_diff_expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
"Image2": "gcr.io/gcp-runtimes/pip-modified",
"Packages2": {
"mock": {
"python3.6": {
"/usr/local/lib/python3.6/site-packages": {
"Version": "2.0.0",
"Size": "504226"
}
},
"pbr": {
"python3.6": {
"/usr/local/lib/python3.6/site-packages": {
"Version": "3.1.1",
"Size": "447110"
}
},
"six": {
"python3.6": {
"/usr/local/lib/python3.6/site-packages": {
"Version": "1.10.0",
"Size": "30098"
}
Expand Down
26 changes: 13 additions & 13 deletions tests/pip_diff_expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,52 @@
"Image2": "gcr.io/gcp-runtimes/pip-modified",
"Packages2": {
"mock": {
"pip-modified/usr/local/lib/python3.6/site-packages": {
"/usr/local/lib/python3.6/site-packages": {
"Version": "2.0.0",
"Size": "504226"
}
},
"pbr": {
"pip-modified/usr/local/lib/python3.6/site-packages": {
"/usr/local/lib/python3.6/site-packages": {
"Version": "3.1.1",
"Size": "447110"
}
},
"six": {
"pip-modified/usr/local/lib/python3.6/site-packages": {
"/usr/local/lib/python3.6/site-packages": {
"Version": "1.10.0",
"Size": "30098"
}
}
},
"InfoDiff": [
{
"Package": "pip",
"Package": "wheel",
"Info1": [
{
"Version": "9.0.1",
"Size": "3741310"
"Version": "0.29.0",
"Size": "103348"
}
],
"Info2": [
{
"Version": "9.0.1",
"Size": "5289421"
"Version": "0.29.0",
"Size": "103509"
}
]
},
{
"Package": "wheel",
"Package": "pip",
"Info1": [
{
"Version": "0.29.0",
"Size": "103348"
"Version": "9.0.1",
"Size": "3741310"
}
],
"Info2": [
{
"Version": "0.29.0",
"Size": "103509"
"Version": "9.0.1",
"Size": "5289421"
}
]
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.