summaryrefslogtreecommitdiff
path: root/odb_test.go
diff options
context:
space:
mode:
authorAidan Nulman <[email protected]>2014-04-03 16:41:43 -0400
committerAidan Nulman <[email protected]>2014-04-03 16:41:43 -0400
commitd9f4adff6c548a6cb6f00258c99129c7e41062b3 (patch)
tree264a73dcf05f99cec7395b20b3488ea202c3cadf /odb_test.go
parentb5e60dc106828b308fdb7e69fe10a0d2dec4eece (diff)
parent9cd1d129bcd567ef65137783a603f8d898d8d933 (diff)
Merge branch 'master' into custom_odb
Conflicts: odb.go wrapper.c
Diffstat (limited to 'odb_test.go')
-rw-r--r--odb_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/odb_test.go b/odb_test.go
index a4f8943..17b3ad2 100644
--- a/odb_test.go
+++ b/odb_test.go
@@ -27,7 +27,7 @@ func TestOdbStream(t *testing.T) {
error = stream.Close()
checkFatal(t, error)
- expectedId, error := NewOidFromString("30f51a3fba5274d53522d0f19748456974647b4f")
+ expectedId, error := NewOid("30f51a3fba5274d53522d0f19748456974647b4f")
checkFatal(t, error)
if stream.Id.Cmp(expectedId) != 0 {
t.Fatal("Wrong data written")
@@ -59,4 +59,4 @@ Initial commit.`;
if oid.Cmp(coid) != 0 {
t.Fatal("Hash and write Oids are different")
}
-} \ No newline at end of file
+}