Integration test refactoring #126
Conversation
integration/integration_test.go
Outdated
| t.FailNow() | ||
| } | ||
|
|
||
| _, ex, _, _ := runtime.Caller(0) |
There was a problem hiding this comment.
This is a bit weird, could you use os.Args[0] instead?
https://golang.org/pkg/os/
There was a problem hiding this comment.
os.Args gives me where the test file is actually being run, which is in a tmp folder somewhere. I actually want to access the directory where the go file actually lives, which is what runtime.Caller gives.
integration/integration_test.go
Outdated
| cwd := filepath.Dir(ex) | ||
|
|
||
| // Grab the latest container-diff binary | ||
| getContainerDiff := exec.Command("gsutil", "cp", "gs://container-diff/latest/container-diff-linux-amd64", ".") |
There was a problem hiding this comment.
Let's just require that container-diff is on the path.
integration/integration_test.go
Outdated
| } | ||
|
|
||
|
|
||
| for _, dockerfile := range dockerfiles { |
There was a problem hiding this comment.
filepath.Glob might be easier than ls'ing everything and filtering here.
integration/integration_test.go
Outdated
| "-c", buildContextPath, | ||
| ) | ||
|
|
||
| err = kanikoCmd.Run() |
There was a problem hiding this comment.
nit: a small helper that takes the cmd and t and does this could be useful.
|
Looks like we'll have to move the container-diff installation piece to the kokoro setup (or the container that will run in GCB) |
sharifelgamal
changed the title
|
This is ready for a look. |
integration/integration_test.go
Outdated
| } | ||
|
|
||
| // Make sure container-diff is on user's PATH | ||
| err = exec.Command("container-diff").Run() |
There was a problem hiding this comment.
nit: exec.LookPath would probably be a bit easier here.
integration/integration_test.go
Outdated
| for _, dockerfile := range dockerfiles { | ||
| t.Run("test_"+dockerfile, func(t *testing.T) { | ||
| dockerfile = dockerfile[len("dockerfile/")+1:] | ||
| fmt.Printf("%s\n", dockerfile) |
There was a problem hiding this comment.
nit: t.Log here instead of fmt.Print
integration/integration_test.go
Outdated
|
|
||
| // container-diff | ||
| daemonDockerImage := daemonPrefix + dockerImage | ||
| //daemonKanikoImage := daemonPrefix + kanikoImage |
No description provided.