Commit 2bd98841 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 5c5ba580
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
package fs1 package fs1
import ( import (
"bytes"
"fmt" "fmt"
"io" "io"
"reflect" "reflect"
...@@ -76,7 +75,7 @@ func checkLoad(t *testing.T, fs *FileStorage, xid zodb.Xid, expect oidLoadedOk) ...@@ -76,7 +75,7 @@ func checkLoad(t *testing.T, fs *FileStorage, xid zodb.Xid, expect oidLoadedOk)
if tid != expect.tid { if tid != expect.tid {
t.Errorf("load %v: returned tid unexpected: %v ; want: %v", xid, tid, expect.tid) t.Errorf("load %v: returned tid unexpected: %v ; want: %v", xid, tid, expect.tid)
} }
if !bytes.Equal(data, expect.data) { // XXX -> reflect.DeepEqual if !reflect.DeepEqual(data, expect.data) { // NOTE reflect to catch nil != ""
t.Errorf("load %v: different data:\nhave: %q\nwant: %q", xid, data, expect.data) t.Errorf("load %v: different data:\nhave: %q\nwant: %q", xid, data, expect.data)
} }
} }
...@@ -220,7 +219,7 @@ func testIterate(t *testing.T, fs *FileStorage, tidMin, tidMax zodb.Tid, expectv ...@@ -220,7 +219,7 @@ func testIterate(t *testing.T, fs *FileStorage, tidMin, tidMax zodb.Tid, expectv
if datai.Tid != dh.Tid { if datai.Tid != dh.Tid {
dataErrorf("tid mismatch: have %v; want %v", datai.Tid, dh.Tid) dataErrorf("tid mismatch: have %v; want %v", datai.Tid, dh.Tid)
} }
if !bytes.Equal(datai.Data, txe.Data()) { if !reflect.DeepEqual(datai.Data, txe.Data()) { // NOTE reflect to catch nil != ""
dataErrorf("data mismatch:\nhave %q\nwant %q", datai.Data, txe.Data()) dataErrorf("data mismatch:\nhave %q\nwant %q", datai.Data, txe.Data())
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment