opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-15 04:34:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add FFJSON encoding/decoding for our container structs

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #323
Approved by: mheon
This commit is contained in:
Matthew Heon
2018-02-12 11:48:20 -05:00
committed by Atomic Bot
parent 445aaf87fa
commit f2041b51f3
6 changed files with 3709 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
libpod/state_test.go
View File

@ -161,11 +161,7 @@ func TestAddAndGetContainer(t *testing.T) {
retrievedCtr, err := state.Container(testCtr.ID())
assert.NoError(t, err)
// Use assert.EqualValues if the test fails to pretty print diff
// between actual and expected
if !testContainersEqual(testCtr, retrievedCtr) {
assert.EqualValues(t, testCtr, retrievedCtr)
}
testContainersEqual(t, testCtr, retrievedCtr)
})
}
@ -185,11 +181,7 @@ func TestAddAndGetContainerFromMultiple(t *testing.T) {
retrievedCtr, err := state.Container(testCtr1.ID())
assert.NoError(t, err)
// Use assert.EqualValues if the test fails to pretty print diff
// between actual and expected
if !testContainersEqual(testCtr1, retrievedCtr) {
assert.EqualValues(t, testCtr1, retrievedCtr)
}
testContainersEqual(t, testCtr1, retrievedCtr)
})
}
@ -350,11 +342,7 @@ func TestLookupContainerByFullID(t *testing.T) {
retrievedCtr, err := state.LookupContainer(testCtr.ID())
assert.NoError(t, err)
// Use assert.EqualValues if the test fails to pretty print diff
// between actual and expected
if !testContainersEqual(testCtr, retrievedCtr) {
assert.EqualValues(t, testCtr, retrievedCtr)
}
testContainersEqual(t, testCtr, retrievedCtr)
})
}
@ -369,11 +357,7 @@ func TestLookupContainerByUniquePartialID(t *testing.T) {
retrievedCtr, err := state.LookupContainer(testCtr.ID()[0:8])
assert.NoError(t, err)
// Use assert.EqualValues if the test fails to pretty print diff
// between actual and expected
if !testContainersEqual(testCtr, retrievedCtr) {
assert.EqualValues(t, testCtr, retrievedCtr)
}
testContainersEqual(t, testCtr, retrievedCtr)
})
}
@ -406,11 +390,7 @@ func TestLookupContainerByName(t *testing.T) {
retrievedCtr, err := state.LookupContainer(testCtr.Name())
assert.NoError(t, err)
// Use assert.EqualValues if the test fails to pretty print diff
// between actual and expected
if !testContainersEqual(testCtr, retrievedCtr) {
assert.EqualValues(t, testCtr, retrievedCtr)
}
testContainersEqual(t, testCtr, retrievedCtr)
})
}
@ -504,11 +484,7 @@ func TestSaveAndUpdateContainer(t *testing.T) {
err = state.UpdateContainer(testCtr)
assert.NoError(t, err)
// Use assert.EqualValues if the test fails to pretty print diff
// between actual and expected
if !testContainersEqual(testCtr, retrievedCtr) {
assert.EqualValues(t, testCtr, retrievedCtr)
}
testContainersEqual(t, testCtr, retrievedCtr)
})
}
@ -600,11 +576,7 @@ func TestGetAllContainersWithOneContainer(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, 1, len(ctrs))
// Use assert.EqualValues if the test fails to pretty print diff
// between actual and expected
if !testContainersEqual(testCtr, ctrs[0]) {
assert.EqualValues(t, testCtr, ctrs[0])
}
testContainersEqual(t, testCtr, ctrs[0])
})
}
@ -1600,11 +1572,7 @@ func TestPodContainersOneContainer(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, 1, len(ctrs))
// Use assert.EqualValues if the test fails to pretty print diff
// between actual and expected
if !testContainersEqual(testCtr, ctrs[0]) {
assert.EqualValues(t, testCtr, ctrs[0])
}
testContainersEqual(t, testCtr, ctrs[0])
})
}
@ -1908,14 +1876,8 @@ func TestAddContainerToPodSucceeds(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, 1, len(allCtrs))
// Use assert.EqualValues if the test fails to pretty print diff
// between actual and expected
if !testContainersEqual(testCtr, ctrs[0]) {
assert.EqualValues(t, testCtr, ctrs[0])
}
if !testContainersEqual(allCtrs[0], ctrs[0]) {
assert.EqualValues(t, allCtrs[0], ctrs[0])
}
testContainersEqual(t, testCtr, ctrs[0])
testContainersEqual(t, ctrs[0], allCtrs[0])
})
}
@ -1980,11 +1942,7 @@ func TestAddContainerToPodWithAddContainer(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, 2, len(allCtrs))
// Use assert.EqualValues if the test fails to pretty print diff
// between actual and expected
if !testContainersEqual(testCtr1, ctrs[0]) {
assert.EqualValues(t, testCtr1, ctrs[0])
}
testContainersEqual(t, testCtr1, ctrs[0])
})
}