opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 17:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6002 from lsm5/fix-specgen-in-bindings-test

Browse Source 
Fix NewSpecGenerator args in pkg/bindings/test
This commit is contained in:
OpenShift Merge Robot
2020-04-27 20:39:27 +02:00
committed by GitHub
parent 733c38028d bee486b91f
commit 618d4be212
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/bindings/test/common_test.go
View File

@ -3,13 +3,13 @@ package test_bindings
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/containers/libpod/libpod/define"
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/containers/libpod/libpod/define"
. "github.com/containers/libpod/pkg/bindings" . "github.com/containers/libpod/pkg/bindings"
"github.com/containers/libpod/pkg/bindings/containers" "github.com/containers/libpod/pkg/bindings/containers"
"github.com/containers/libpod/pkg/specgen" "github.com/containers/libpod/pkg/specgen"
@ -189,7 +189,7 @@ func (b *bindingTest) restoreImageFromCache(i testImage) {
// Run a container within or without a pod // Run a container within or without a pod
// and add or append the alpine image to it // and add or append the alpine image to it
func (b *bindingTest) RunTopContainer(containerName *string, insidePod *bool, podName *string) (string, error) { func (b *bindingTest) RunTopContainer(containerName *string, insidePod *bool, podName *string) (string, error) {
s := specgen.NewSpecGenerator(alpine.name) s := specgen.NewSpecGenerator(alpine.name, false)
s.Terminal = false s.Terminal = false
s.Command = []string{"top"} s.Command = []string{"top"}
if containerName != nil { if containerName != nil {

4
pkg/bindings/test/containers_test.go
View File

@ -360,7 +360,7 @@ var _ = Describe("Podman containers ", func() {
It("logging", func() { It("logging", func() {
stdoutChan := make(chan string, 10) stdoutChan := make(chan string, 10)
s := specgen.NewSpecGenerator(alpine.name) s := specgen.NewSpecGenerator(alpine.name, false)
s.Terminal = true s.Terminal = true
s.Command = []string{"date", "-R"} s.Command = []string{"date", "-R"}
r, err := containers.CreateWithSpec(bt.conn, s) r, err := containers.CreateWithSpec(bt.conn, s)
@ -521,7 +521,7 @@ var _ = Describe("Podman containers ", func() {
}) })
It("container init", func() { It("container init", func() {
s := specgen.NewSpecGenerator(alpine.name) s := specgen.NewSpecGenerator(alpine.name, false)
ctr, err := containers.CreateWithSpec(bt.conn, s) ctr, err := containers.CreateWithSpec(bt.conn, s)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
err = containers.ContainerInit(bt.conn, ctr.ID) err = containers.ContainerInit(bt.conn, ctr.ID)

2
pkg/bindings/test/create_test.go
View File

@ -31,7 +31,7 @@ var _ = Describe("Create containers ", func() {
}) })
It("create a container running top", func() { It("create a container running top", func() {
s := specgen.NewSpecGenerator(alpine.name) s := specgen.NewSpecGenerator(alpine.name, false)
s.Command = []string{"top"} s.Command = []string{"top"}
s.Terminal = true s.Terminal = true
s.Name = "top" s.Name = "top"

2
pkg/bindings/test/info_test.go
View File

@ -45,7 +45,7 @@ var _ = Describe("Podman info", func() {
}) })
It("podman info container counts", func() { It("podman info container counts", func() {
s := specgen.NewSpecGenerator(alpine.name) s := specgen.NewSpecGenerator(alpine.name, false)
_, err := containers.CreateWithSpec(bt.conn, s) _, err := containers.CreateWithSpec(bt.conn, s)
Expect(err).To(BeNil()) Expect(err).To(BeNil())