Merge pull request #4403 from mheon/cherrypick_163

Cherrypicks for v1.6.3 final

1 files changed, 64 insertions, 0 deletions

diff --git a/libpod/config/config_test.go b/libpod/config/config_test.go
new file mode 100644
index 000000000..47c092440
--- /dev/null
+++ b/libpod/config/config_test.go
@@ -0,0 +1,64 @@
+package config
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/storage"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEmptyConfig(t *testing.T) {
+	// Make sure that we can read empty configs
+	config, err := readConfigFromFile("testdata/empty.conf")
+	assert.NotNil(t, config)
+	assert.Nil(t, err)
+}
+
+func TestDefaultLibpodConf(t *testing.T) {
+	// Make sure that we can read the default libpod.conf
+	config, err := readConfigFromFile("testdata/libpod.conf")
+	assert.NotNil(t, config)
+	assert.Nil(t, err)
+}
+
+func TestMergeEmptyAndDefaultMemoryConfig(t *testing.T) {
+	// Make sure that when we merge the default config into an empty one that we
+	// effectively get the default config.
+	defaultConfig, err := defaultConfigFromMemory()
+	assert.NotNil(t, defaultConfig)
+	assert.Nil(t, err)
+	defaultConfig.StateType = define.InvalidStateStore
+	defaultConfig.StorageConfig = storage.StoreOptions{}
+
+	emptyConfig, err := readConfigFromFile("testdata/empty.conf")
+	assert.NotNil(t, emptyConfig)
+	assert.Nil(t, err)
+
+	err = emptyConfig.mergeConfig(defaultConfig)
+	assert.Nil(t, err)
+
+	equal := reflect.DeepEqual(emptyConfig, defaultConfig)
+	assert.True(t, equal)
+}
+
+func TestMergeEmptyAndLibpodConfig(t *testing.T) {
+	// Make sure that when we merge the default config into an empty one that we
+	// effectively get the default config.
+	libpodConfig, err := readConfigFromFile("testdata/libpod.conf")
+	assert.NotNil(t, libpodConfig)
+	assert.Nil(t, err)
+	libpodConfig.StateType = define.InvalidStateStore
+	libpodConfig.StorageConfig = storage.StoreOptions{}
+
+	emptyConfig, err := readConfigFromFile("testdata/empty.conf")
+	assert.NotNil(t, emptyConfig)
+	assert.Nil(t, err)
+
+	err = emptyConfig.mergeConfig(libpodConfig)
+	assert.Nil(t, err)
+
+	equal := reflect.DeepEqual(emptyConfig, libpodConfig)
+	assert.True(t, equal)
+}