Skip to content

Commit

Permalink
Merge pull request #25 from giggsoff/master
Browse files Browse the repository at this point in the history
use local stage1-xen.aci
  • Loading branch information
sadov authored Feb 5, 2020
2 parents 6bed247 + 1c522a7 commit cd01ade
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions rkt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestRktSequence(t *testing.T) {

var rktTestDir = "pods_test"
var binaryName = "eveadm"

var stage1XenPath = ""
hasXL := false
dir, err := os.Getwd()
xlcmd := exec.Command("which", "xl")
Expand All @@ -42,6 +42,11 @@ func TestRktSequence(t *testing.T) {
} else {
if strings.Contains(string(output), "xl") {
hasXL = true
stage1XenPath = path.Join(dir, "tests", "stage1-xen.aci")
_, err := os.Stat(stage1XenPath)
if os.IsNotExist(err) {
t.Fatal("No stage1-xen.aci found in tests directory")
}
}
}
idcmd := exec.Command("id", "-u")
Expand Down Expand Up @@ -110,7 +115,7 @@ func TestRktSequence(t *testing.T) {
containerCreate = rktTestRun{
"container_create",
func() []string {
return []string{"rkt", "create", rktCtx.imageHash, "--dir=" + dname, "--paused=true"}
return []string{"rkt", "create", rktCtx.imageHash, "--dir=" + dname, "--paused=true", "--stage1-path=" + stage1XenPath}
},
func() []string {
return []string{}
Expand Down

0 comments on commit cd01ade

Please sign in to comment.