Merge pull request #239 from adrianlzt/fix/TestCursor

sdjournal: support testing cursor against current position

Author: lucab

sdjournal/journal.go

@@ -303,6 +303,7 @@ package sdjournal
 import "C"
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"strings"
 	"sync"
@@ -370,6 +371,12 @@ const (
 	IndefiniteWait time.Duration = 1<<63 - 1
 )
 
+var (
+	// Error show when using TestCursor function and cursor parameter is not the same
+	// as the current cursor position
+	ErrNoTestCursor = errors.New("Cursor parameter is not the same as current position")
+)
+
 // Journal is a Go wrapper of an sd_journal structure.
 type Journal struct {
 	cjournal *C.sd_journal
@@ -879,6 +886,8 @@ func (j *Journal) TestCursor(cursor string) error {
 
 	if r < 0 {
 		return fmt.Errorf("failed to test to cursor %q: %d", cursor, syscall.Errno(-r))
+	} else if r == 0 {
+		return ErrNoTestCursor
 	}
 
 	return nil

sdjournal/journal_test.go

@@ -178,6 +178,20 @@ func TestJournalCursorGetSeekAndTest(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error testing cursor to journal: %s", err)
 	}
+
+	err = journal.Print(journal.PriInfo, "second message %s", time.Now())
+	if err != nil {
+		t.Fatalf("Error writing to journal: %s", err)
+	}
+
+	if err = waitAndNext(j); err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	err = j.TestCursor(c)
+	if err != ErrNoTestCursor {
+		t.Fatalf("Error, TestCursor should fail because current cursor has moved from the previous obtained cursor")
+	}
 }
 
 func TestNewJournalFromDir(t *testing.T) {