From 6ba6ecf59b9204d36388de07b866f157a4d13957 Mon Sep 17 00:00:00 2001 From: baude Date: Fri, 2 Feb 2018 11:02:09 -0600 Subject: Migrate Create|Commit to ginkgo Migrate create and commit bats tests to the ginkgo test suite. In doing so, some structures had to be moved to pkg/podmanstructs/podmanstructs.go so we could do better verification of test results. Signed-off-by: baude Closes: #286 Approved by: rhatdan --- libpod/driver/driver.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'libpod/driver/driver.go') diff --git a/libpod/driver/driver.go b/libpod/driver/driver.go index 8475810a8..d84ce8d3c 100644 --- a/libpod/driver/driver.go +++ b/libpod/driver/driver.go @@ -1,12 +1,9 @@ package driver -import cstorage "github.com/containers/storage" - -// Data handles the data for a storage driver -type Data struct { - Name string `json:"Name"` - Data map[string]string `json:"Data"` -} +import ( + cstorage "github.com/containers/storage" + "github.com/projectatomic/libpod/pkg/inspect" +) // GetDriverName returns the name of the driver for the given store func GetDriverName(store cstorage.Store) (string, error) { @@ -27,7 +24,7 @@ func GetDriverMetadata(store cstorage.Store, layerID string) (map[string]string, } // GetDriverData returns the Data struct with information of the driver used by the store -func GetDriverData(store cstorage.Store, layerID string) (*Data, error) { +func GetDriverData(store cstorage.Store, layerID string) (*inspect.Data, error) { name, err := GetDriverName(store) if err != nil { return nil, err @@ -36,7 +33,7 @@ func GetDriverData(store cstorage.Store, layerID string) (*Data, error) { if err != nil { return nil, err } - return &Data{ + return &inspect.Data{ Name: name, Data: metaData, }, nil -- cgit v1.2.3-54-g00ecf