container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-20 01:03:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a function for check if command exist

Browse source 
Use this function to check if command exist before execute it
in our test.

Signed-off-by: Yiqiao Pu <ypu@redhat.com>
This commit is contained in:
Yiqiao Pu 2018-04-11 15:04:25 +08:00
parent d6d7edb841
commit f1a4867bcd
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/e2e/libpod_suite_test.go
View file

@ -612,3 +612,13 @@ func WaitContainerReady(p *PodmanTest, id string, expStr string, timeout int, st
s.WaitWithDefaultTimeout()
}
}
//IsCommandAvaible check if command exist
func IsCommandAvailable(command string) bool {
check := exec.Command("bash", "-c", strings.Join([]string{"command -v", command}, " "))
err := check.Run()
if err != nil {
return false
}
return true
}

24
test/e2e/push_test.go
View file

@ -78,14 +78,15 @@ var _ = Describe("Podman push", func() {
cwd, _ := os.Getwd()
certPath := filepath.Join(cwd, "../", "certs")
setup := podmanTest.SystemExec("getenforce", []string{})
setup.WaitWithDefaultTimeout()
if setup.OutputToString() == "Enforcing" {
if IsCommandAvailable("getenforce") {
ge := podmanTest.SystemExec("getenforce", []string{})
ge.WaitWithDefaultTimeout()
if ge.OutputToString() == "Enforcing" {
se := podmanTest.SystemExec("setenforce", []string{"0"})
se.WaitWithDefaultTimeout()
setup = podmanTest.SystemExec("setenforce", []string{"0"})
setup.WaitWithDefaultTimeout()
defer podmanTest.SystemExec("setenforce", []string{"1"})
defer podmanTest.SystemExec("setenforce", []string{"1"})
}
}
session := podmanTest.Podman([]string{"run", "--entrypoint", "htpasswd", "registry:2", "-Bbn", "podmantest", "test"})
@ -123,7 +124,7 @@ var _ = Describe("Podman push", func() {
push.WaitWithDefaultTimeout()
Expect(push.ExitCode()).To(Equal(0))
setup = podmanTest.SystemExec("cp", []string{filepath.Join(certPath, "domain.crt"), "/etc/containers/certs.d/localhost:5000/ca.crt"})
setup := podmanTest.SystemExec("cp", []string{filepath.Join(certPath, "domain.crt"), "/etc/containers/certs.d/localhost:5000/ca.crt"})
setup.WaitWithDefaultTimeout()
defer os.RemoveAll("/etc/containers/certs.d/localhost:5000")
@ -186,17 +187,14 @@ var _ = Describe("Podman push", func() {
})
It("podman push to local ostree", func() {
setup := podmanTest.SystemExec("which", []string{"ostree"})
setup.WaitWithDefaultTimeout()
if setup.ExitCode() != 0 {
if !IsCommandAvailable("ostree") {
Skip("ostree is not installed")
}
ostreePath := filepath.Join(podmanTest.TempDir, "ostree/repo")
os.MkdirAll(ostreePath, os.ModePerm)
setup = podmanTest.SystemExec("ostree", []string{strings.Join([]string{"--repo=", ostreePath}, ""), "init"})
setup := podmanTest.SystemExec("ostree", []string{strings.Join([]string{"--repo=", ostreePath}, ""), "init"})
setup.WaitWithDefaultTimeout()
session := podmanTest.Podman([]string{"push", ALPINE, strings.Join([]string{"ostree:alp@", ostreePath}, "")})