Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2615 from yichengq/fix-upgrade-test

Browse Source 
integration: fix upgrade test
This commit is contained in:
Yicheng Qin 2015-04-01 09:44:01 -07:00
commit 2c7a8c2216
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
integration/migration_test.go
View File

@ -15,8 +15,6 @@
package integration package integration
import ( import (
"github.com/coreos/etcd/pkg/types"
"net"
"os/exec" "os/exec"
"testing" "testing"
) )
@ -24,25 +22,16 @@ import (
func TestUpgradeMember(t *testing.T) { func TestUpgradeMember(t *testing.T) {
defer afterTest(t) defer afterTest(t)
m := mustNewMember(t, "integration046") m := mustNewMember(t, "integration046")
newPeerListeners := make([]net.Listener, 0)
newPeerListeners = append(newPeerListeners, newListenerWithAddr(t, "127.0.0.1:59892"))
m.PeerListeners = newPeerListeners
urls, err := types.NewURLs([]string{"http://127.0.0.1:59892"})
if err != nil {
t.Fatal(err)
}
m.PeerURLs = urls
m.NewCluster = true
c := &cluster{}
c.Members = []*member{m}
fillClusterForMembers(c.Members, "etcd-cluster")
cmd := exec.Command("cp", "-r", "testdata/integration046_data/conf", "testdata/integration046_data/log", "testdata/integration046_data/snapshot", m.DataDir) cmd := exec.Command("cp", "-r", "testdata/integration046_data/conf", "testdata/integration046_data/log", "testdata/integration046_data/snapshot", m.DataDir)
err = cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if err := m.Launch(); err != nil {
t.Fatal(err)
}
defer m.Terminate(t)
m.WaitOK(t)
c.Launch(t) clusterMustProgress(t, []*member{m})
defer c.Terminate(t)
clusterMustProgress(t, c.Members)
} }