Merge pull request #274 from muesli/sdjournal-test-fixes

sdjournal: Fixed concurrency & shadowing issues in tests

Author: lucab

sdjournal/journal_test.go

@@ -53,15 +53,17 @@ func TestJournalFollow(t *testing.T) {
 
 	// start writing some test entries
 	done := make(chan struct{}, 1)
+	errCh := make(chan error, 1)
 	defer close(done)
 	go func() {
 		for {
 			select {
 			case <-done:
 				return
 			default:
-				if err := journal.Print(journal.PriInfo, "test message %s", time.Now()); err != nil {
-					t.Fatalf("Error writing to journal: %s", err)
+				if perr := journal.Print(journal.PriInfo, "test message %s", time.Now()); err != nil {
+					errCh <- perr
+					return
 				}
 
 				time.Sleep(time.Second)
@@ -74,6 +76,12 @@ func TestJournalFollow(t *testing.T) {
 	if err = r.Follow(time.After(timeout), os.Stdout); err != ErrExpired {
 		t.Fatalf("Error during follow: %s", err)
 	}
+
+	select {
+	case err := <-errCh:
+		t.Fatalf("Error writing to journal: %s", err)
+	default:
+	}
 }
 
 func TestJournalWait(t *testing.T) {
@@ -395,7 +403,7 @@ func TestJournalGetUniqueValues(t *testing.T) {
 	uniqueString := generateRandomField(20)
 	testEntries := []string{"A", "B", "C", "D"}
 	for _, v := range testEntries {
-		err := journal.Send("TEST: "+uniqueString, journal.PriInfo, map[string]string{uniqueString: v})
+		err = journal.Send("TEST: "+uniqueString, journal.PriInfo, map[string]string{uniqueString: v})
 		if err != nil {
 			t.Fatal(err)
 		}