Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281

Conflicts:
	modules/base/tool.go

1 files changed, 23 insertions, 0 deletions

diff --git a/modules/captcha/siprng_test.go b/modules/captcha/siprng_test.go
new file mode 100644
index 00000000..3b10fe58
--- /dev/null
+++ b/modules/captcha/siprng_test.go
@@ -0,0 +1,23 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package captcha
+
+import "testing"
+
+func TestSiphash(t *testing.T) {
+	good := uint64(0xe849e8bb6ffe2567)
+	cur := siphash(0, 0, 0)
+	if cur != good {
+		t.Fatalf("siphash: expected %x, got %x", good, cur)
+	}
+}
+
+func BenchmarkSiprng(b *testing.B) {
+	b.SetBytes(8)
+	p := &siprng{}
+	for i := 0; i < b.N; i++ {
+		p.Uint64()
+	}
+}