Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test/e2e/memcached_test.go: fix dep issues in travis #525

Merged
merged 2 commits into from
Sep 24, 2018
Merged

test/e2e/memcached_test.go: fix dep issues in travis #525

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a752d1b
test/e2e/memcached_test.go: fix dep issues in travis
AlexNPavel Sep 24, 2018
e12c5ce
test/e2e/memcached_test.go: fix source replacement
AlexNPavel Sep 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions test/e2e/memcached_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"os"
"os/exec"
"path"
"strings"
"testing"
"time"

Expand Down Expand Up @@ -68,9 +69,30 @@ func TestMemcached(t *testing.T) {
ctx.AddFinalizerFn(func() error { return os.RemoveAll(path.Join(gopath, "/src/github.com/example-inc/memcached-operator")) })

os.Chdir("memcached-operator")
os.RemoveAll("vendor/github.com/operator-framework/operator-sdk/pkg")
os.Symlink(path.Join(gopath, "/src/github.com/operator-framework/operator-sdk/pkg"),
"vendor/github.com/operator-framework/operator-sdk/pkg")

prSlug, ok := os.LookupEnv("TRAVIS_PULL_REQUEST_SLUG")
if ok {
prSha, ok := os.LookupEnv("TRAVIS_PULL_REQUEST_SHA")
if ok {
gopkg, err := ioutil.ReadFile("Gopkg.toml")
if err != nil {
t.Fatal(err)
}
// TODO: make this match more complete in case we add another repo tracking master
gopkg = bytes.Replace(gopkg, []byte("branch = \"master\""), []byte("# branch = \"master\""), -1)
gopkgString := string(gopkg)
gopkgLoc := strings.LastIndex(gopkgString, "\n name = \"github.com/operator-framework/operator-sdk\"\n")
gopkgString = gopkgString[:gopkgLoc] + "\n source = \"https://github.com/" + prSlug + "\"\n revision = \"" + prSha + "\"\n" + gopkgString[gopkgLoc+1:]
err = ioutil.WriteFile("Gopkg.toml", []byte(gopkgString), os.FileMode(filemode))
cmdOut, err = exec.Command("dep", "ensure").CombinedOutput()
if err != nil {
t.Fatalf("dep ensure after gopkg replace failed: %v\nCommand Output: %s\nGopkg Contents: %s", err, cmdOut, gopkgString)
}
} else {
t.Fatal("could not find sha of PR")
}
}

handlerFile, err := os.Create("pkg/stub/handler.go")
if err != nil {
t.Fatal(err)
Expand Down