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

Update migration.

Browse Source
This commit is contained in:
Ben Johnson
2013-11-04 13:16:45 -07:00
parent 3d4e604607
commit bf76af8fd1
9 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/functional/v1_migration_test.go
View File

@@ -5,6 +5,7 @@ import (
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"testing"
"time"
@@ -18,22 +19,29 @@ func TestV1Migration(t *testing.T) {
os.RemoveAll(path)
defer os.RemoveAll(path)
// Copy over fixture files.
if err := exec.Command("cp", "-r", "../fixtures/v1/complete", path).Run(); err != nil {
panic("Fixture initialization error")
}
nodes := []string{"node0", "node1"}
for i, node := range nodes {
nodepath := filepath.Join(path, node)
procAttr := new(os.ProcAttr)
procAttr.Files = []*os.File{nil, os.Stdout, os.Stderr}
args := []string{"etcd", fmt.Sprintf("-d=%s", path)}
// Copy over fixture files.
if err := exec.Command("cp", "-r", "../fixtures/v1/" + node, nodepath).Run(); err != nil {
panic("Fixture initialization error")
}
process, err := os.StartProcess(EtcdBinPath, args, procAttr)
if err != nil {
t.Fatal("start process failed:" + err.Error())
return
procAttr := new(os.ProcAttr)
procAttr.Files = []*os.File{nil, os.Stdout, os.Stderr}
args := []string{"etcd", fmt.Sprintf("-d=%s", nodepath)}
args = append(args, "-c", fmt.Sprintf("127.0.0.1:%d", 4001 + i))
args = append(args, "-s", fmt.Sprintf("127.0.0.1:%d", 7001 + i))
process, err := os.StartProcess(EtcdBinPath, args, procAttr)
if err != nil {
t.Fatal("start process failed:" + err.Error())
return
}
defer process.Kill()
time.Sleep(time.Second)
}
defer process.Kill()
time.Sleep(time.Second)
// Ensure deleted message is removed.
@@ -48,4 +56,3 @@ func TestV1Migration(t *testing.T) {
assert.Nil(t, err, "")
assert.Equal(t, resp.StatusCode, 404, "")
}