vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #6179 from ypu/binDir 

e2e: Update binary path with binDir
release-3.1
Anthony Romano 2016-08-15 10:36:04 -07:00 committed by GitHub
parent 9eb6ea34bd d0d8e49e20
commit 561c3b918a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/ctl_v2_test.go
View File

@ -427,7 +427,7 @@ func etcdctlBackup(clus *etcdProcessCluster, dataDir, backupDir string) error {
}
func mustEtcdctl(t *testing.T) {
if !fileutil.Exist("../bin/etcdctl") {
if !fileutil.Exist(binDir + "/etcdctl") {
t.Fatalf("could not find etcdctl binary")
}
}

4
e2e/etcd_release_upgrade_test.go
View File

@ -27,7 +27,7 @@ import (
// TestReleaseUpgrade ensures that changes to master branch does not affect
// upgrade from latest etcd releases.
func TestReleaseUpgrade(t *testing.T) {
lastReleaseBinary := "../bin/etcd-last-release"
lastReleaseBinary := binDir + "/etcd-last-release"
if !fileutil.Exist(lastReleaseBinary) {
t.Skipf("%q does not exist", lastReleaseBinary)
}
@ -72,7 +72,7 @@ func TestReleaseUpgrade(t *testing.T) {
if err := epc.procs[i].Stop(); err != nil {
t.Fatalf("#%d: error closing etcd process (%v)", i, err)
}
epc.procs[i].cfg.execPath = "../bin/etcd"
epc.procs[i].cfg.execPath = binDir + "/etcd"
epc.procs[i].cfg.keepDataDir = true
if err := epc.procs[i].Restart(); err != nil {