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

e2e: Adding better diagnostic and location for temporary files to Snapshot tests.

Browse Source
This commit is contained in:
Piotr Tabor
2021-01-11 00:20:16 +01:00
parent 26f9b4be8f
commit 74274f4417
2 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/etcdserver/api/v2store/node_extern_test.go
View File

@@ -102,7 +102,13 @@ func TestNodeExternClone(t *testing.T) {
}
func sameSlice(a, b []*NodeExtern) bool {
<<<<<<< HEAD
ah := (*reflect.SliceHeader)(unsafe.Pointer(&a))
bh := (*reflect.SliceHeader)(unsafe.Pointer(&b))
return *ah == *bh
=======
va := reflect.ValueOf(a)
vb := reflect.ValueOf(b)
return va.Len() == vb.Len() && va.Pointer() == vb.Pointer()
>>>>>>> 6f8273a2a (fixup! e2e: Adding better diagnostic and location for temporary files to Snapshot tests.)
}