InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into runtime-version

Browse Source 
Signed-off-by: Carlos de Paula <me@carlosedp.com>
This commit is contained in:
Carlos Eduardo
2019-09-18 11:53:55 -03:00
committed by Carlos de Paula
parent 1a96cf95ca ad1b781e44
commit 400af1717c
243 changed files with 661 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/info_unix_test.go
View File

@@ -39,7 +39,7 @@ func TestParseInitVersion(t *testing.T) {
}
for _, test := range tests {
version, commit, err := parseInitVersion(string(test.output))
version, commit, err := parseInitVersion(test.output)
if test.invalid {
assert.Check(t, is.ErrorContains(err, ""))
} else {
@@ -50,7 +50,7 @@ func TestParseInitVersion(t *testing.T) {
}
}
func parseRuncVersion(t *testing.T) {
func TestParseRuntimeVersion(t *testing.T) {
tests := []struct {
output string
runtime string
@@ -103,7 +103,7 @@ spec: 1.0.0
}
for _, test := range tests {
runtime, version, commit, err := parseRuntimeVersion(string(test.output))
runtime, version, commit, err := parseRuntimeVersion(test.output)
if test.invalid {
assert.Check(t, is.ErrorContains(err, ""))
} else {