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 #25 from xiangli-cmu/master

Browse Source 
fix the recoveryTest
This commit is contained in:
Xiang Li 2013-07-16 22:09:23 -07:00
commit a2c52a7bcb
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
store/store_test.go
View File

@ -10,7 +10,7 @@ import (
func TestStoreGetDelete(t *testing.T) { func TestStoreGetDelete(t *testing.T) {
s := CreateStore(100) s := CreateStore(100)
s.Set("foo", "bar", time.Unix(0, 0), 9) s.Set("foo", "bar", time.Unix(0, 0), 1)
res, err := s.Get("foo") res, err := s.Get("foo")
if err != nil { if err != nil {
@ -24,7 +24,7 @@ func TestStoreGetDelete(t *testing.T) {
t.Fatalf("Cannot get stored value") t.Fatalf("Cannot get stored value")
} }
s.Delete("foo", 0) s.Delete("foo", 2)
_, err = s.Get("foo") _, err = s.Get("foo")
if err == nil { if err == nil {
@ -32,38 +32,42 @@ func TestStoreGetDelete(t *testing.T) {
} }
} }
// func TestSaveAndRecovery(t *testing.T) { func TestSaveAndRecovery(t *testing.T) {
// Set("foo", "bar", time.Unix(0, 0)) s := CreateStore(100)
// Set("foo2", "bar2", time.Now().Add(time.Second * 5)) s.Set("foo", "bar", time.Unix(0, 0), 1)
// state, err := s.Save() s.Set("foo2", "bar2", time.Now().Add(time.Second * 5), 2)
state, err := s.Save()
// if err != nil { if err != nil {
// t.Fatalf("Cannot Save") t.Fatalf("Cannot Save %s", err)
// } }
// newStore := createStore() newStore := CreateStore(100)
// // wait for foo2 expires // wait for foo2 expires
// time.Sleep(time.Second * 6) time.Sleep(time.Second * 6)
// newStore.Recovery(state) newStore.Recovery(state)
// res := newStore.Get("foo") res, err := newStore.Get("foo")
// if res.OldValue != "bar" { var result Response
// t.Fatalf("Cannot recovery") json.Unmarshal(res, &result)
// }
// res = newStore.Get("foo2") if result.Value != "bar" {
t.Fatalf("Recovery Fail")
}
// if res.Exist { res, err = newStore.Get("foo2")
// t.Fatalf("Get expired value")
// }
// s.Delete("foo") if err == nil {
t.Fatalf("Get expired value")
}
// } s.Delete("foo", 3)
}
func TestExpire(t *testing.T) { func TestExpire(t *testing.T) {
fmt.Println(time.Now()) fmt.Println(time.Now())
@ -81,7 +85,7 @@ func TestExpire(t *testing.T) {
} }
//test change expire time //test change expire time
s.Set("foo", "bar", time.Now().Add(time.Second*10), 0) s.Set("foo", "bar", time.Now().Add(time.Second*10), 1)
_, err = s.Get("foo") _, err = s.Get("foo")
@ -89,7 +93,7 @@ func TestExpire(t *testing.T) {
t.Fatalf("Cannot get Value") t.Fatalf("Cannot get Value")
} }
s.Set("foo", "barbar", time.Now().Add(time.Second*1), 0) s.Set("foo", "barbar", time.Now().Add(time.Second*1), 2)
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
@ -100,9 +104,9 @@ func TestExpire(t *testing.T) {
} }
// test change expire to stable // test change expire to stable
s.Set("foo", "bar", time.Now().Add(time.Second*1), 0) s.Set("foo", "bar", time.Now().Add(time.Second*1), 3)
s.Set("foo", "bar", time.Unix(0, 0), 0) s.Set("foo", "bar", time.Unix(0, 0), 4)
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
@ -113,7 +117,7 @@ func TestExpire(t *testing.T) {
} }
// test stable to expire // test stable to expire
s.Set("foo", "bar", time.Now().Add(time.Second*1), 0) s.Set("foo", "bar", time.Now().Add(time.Second*1), 5)
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
_, err = s.Get("foo") _, err = s.Get("foo")
@ -122,7 +126,7 @@ func TestExpire(t *testing.T) {
} }
// test set older node // test set older node
s.Set("foo", "bar", time.Now().Add(-time.Second*1), 0) s.Set("foo", "bar", time.Now().Add(-time.Second*1), 6)
_, err = s.Get("foo") _, err = s.Get("foo")
if err == nil { if err == nil {