summaryrefslogtreecommitdiff
path: root/test/e2e/common_test.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-01-19 20:40:37 +0100
committerGitHub <noreply@github.com>2019-01-19 20:40:37 +0100
commit579fc0f7eb3928a076b0a5d1d6ec444205a0a930 (patch)
tree739a21529954fb0009e5fa2a785d753389e344b4 /test/e2e/common_test.go
parent0d4bfb013108f836dbc6369d38b01b6e92d6141d (diff)
parenteadaa5fb420e3e8e6b0e277ac88cc528f9950ee4 (diff)
downloadpodman-579fc0f7eb3928a076b0a5d1d6ec444205a0a930.tar.gz
podman-579fc0f7eb3928a076b0a5d1d6ec444205a0a930.tar.bz2
podman-579fc0f7eb3928a076b0a5d1d6ec444205a0a930.zip
Merge pull request #2183 from baude/remoteinspect
podman-remote inspect
Diffstat (limited to 'test/e2e/common_test.go')
-rw-r--r--test/e2e/common_test.go19
1 files changed, 15 insertions, 4 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index e00a59b7f..a75601b65 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -1,17 +1,19 @@
package integration
import (
+ "encoding/json"
"fmt"
- . "github.com/containers/libpod/test/utils"
"os"
"os/exec"
+ "path/filepath"
+ "strings"
+ "testing"
+ "github.com/containers/libpod/pkg/inspect"
+ . "github.com/containers/libpod/test/utils"
"github.com/containers/storage/pkg/reexec"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- "path/filepath"
- "strings"
- "testing"
)
var (
@@ -227,3 +229,12 @@ func (p *PodmanTestIntegration) CreateArtifact(image string) error {
}
return nil
}
+
+// InspectImageJSON takes the session output of an inspect
+// image and returns json
+func (s *PodmanSessionIntegration) InspectImageJSON() []inspect.ImageData {
+ var i []inspect.ImageData
+ err := json.Unmarshal(s.Out.Contents(), &i)
+ Expect(err).To(BeNil())
+ return i
+}