merge master

This commit is contained in:
Xiang Li
2013-12-02 22:36:38 -05:00
14 changed files with 158 additions and 66 deletions

View File

@ -41,24 +41,24 @@ func TestScanHistory(t *testing.T) {
eh.addEvent(newEvent(Create, "/foo/bar/bar", 4, 4))
eh.addEvent(newEvent(Create, "/foo/foo/foo", 5, 5))
e, err := eh.scan("/foo", 1)
e, err := eh.scan("/foo", false, 1)
if err != nil || e.Index() != 1 {
t.Fatalf("scan error [/foo] [1] %v", e.Index)
}
e, err = eh.scan("/foo/bar", 1)
e, err = eh.scan("/foo/bar", false, 1)
if err != nil || e.Index() != 2 {
t.Fatalf("scan error [/foo/bar] [2] %v", e.Index)
}
e, err = eh.scan("/foo/bar", 3)
e, err = eh.scan("/foo/bar", true, 3)
if err != nil || e.Index() != 4 {
t.Fatalf("scan error [/foo/bar/bar] [4] %v", e.Index)
}
e, err = eh.scan("/foo/bar", 6)
e, err = eh.scan("/foo/bar", true, 6)
if e != nil {
t.Fatalf("bad index shoud reuturn nil")