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

integration: fix STM tests to compile against new interface

Browse Source
This commit is contained in:
Anthony Romano 2016-12-30 09:38:00 -08:00
parent 13420b33a0
commit 555b8047e6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
integration/v3_stm_test.go
View File

@ -63,7 +63,8 @@ func TestSTMConflict(t *testing.T) {
return nil return nil
} }
go func() { go func() {
_, err := concurrency.NewSTMRepeatable(context.TODO(), curEtcdc, applyf) iso := concurrency.WithIsolation(concurrency.RepeatableReads)
_, err := concurrency.NewSTM(curEtcdc, applyf, iso)
errc <- err errc <- err
}() }()
} }
@ -100,7 +101,9 @@ func TestSTMPutNewKey(t *testing.T) {
stm.Put("foo", "bar") stm.Put("foo", "bar")
return nil return nil
} }
if _, err := concurrency.NewSTMRepeatable(context.TODO(), etcdc, applyf); err != nil {
iso := concurrency.WithIsolation(concurrency.RepeatableReads)
if _, err := concurrency.NewSTM(etcdc, applyf, iso); err != nil {
t.Fatalf("error on stm txn (%v)", err) t.Fatalf("error on stm txn (%v)", err)
} }
@ -126,7 +129,10 @@ func TestSTMAbort(t *testing.T) {
stm.Put("foo", "bap") stm.Put("foo", "bap")
return nil return nil
} }
if _, err := concurrency.NewSTMRepeatable(ctx, etcdc, applyf); err == nil {
iso := concurrency.WithIsolation(concurrency.RepeatableReads)
sctx := concurrency.WithAbortContext(ctx)
if _, err := concurrency.NewSTM(etcdc, applyf, iso, sctx); err == nil {
t.Fatalf("no error on stm txn") t.Fatalf("no error on stm txn")
} }
@ -186,7 +192,8 @@ func TestSTMSerialize(t *testing.T) {
return nil return nil
} }
go func() { go func() {
_, err := concurrency.NewSTMSerializable(context.TODO(), curEtcdc, applyf) iso := concurrency.WithIsolation(concurrency.Serializable)
_, err := concurrency.NewSTM(curEtcdc, applyf, iso)
errc <- err errc <- err
}() }()
} }
@ -229,7 +236,9 @@ func TestSTMApplyOnConcurrentDeletion(t *testing.T) {
stm.Put("foo2", "bar2") stm.Put("foo2", "bar2")
return nil return nil
} }
if _, err := concurrency.NewSTMRepeatable(context.TODO(), etcdc, applyf); err != nil {
iso := concurrency.WithIsolation(concurrency.RepeatableReads)
if _, err := concurrency.NewSTM(etcdc, applyf, iso); err != nil {
t.Fatalf("error on stm txn (%v)", err) t.Fatalf("error on stm txn (%v)", err)
} }
if try != 2 { if try != 2 {