Merge pull request ClickHouse#254 from rebrendov/master

Fix now() function

Author: kshvakov

bootstrap.go

@@ -55,7 +55,7 @@ func init() {
 }
 
 func now() time.Time {
-	return time.Unix(atomic.LoadInt64(&unixtime), 0)
+	return time.Unix(0, atomic.LoadInt64(&unixtime))
 }
 
 type bootstrap struct{}

bootstrap_test.go

@@ -4,6 +4,7 @@ import (
 	"database/sql/driver"
 	"reflect"
 	"testing"
+	"time"
 )
 
 func Test_bootstrap_Open(t *testing.T) {
@@ -69,3 +70,27 @@ func TestOpen(t *testing.T) {
 		})
 	}
 }
+
+func Test_now(t *testing.T) {
+	tests := []struct {
+		name          string
+		sleepDuration time.Duration
+		want          time.Time
+	}{
+		{
+			name:          "1 second",
+			sleepDuration: time.Second,
+			want:          time.Unix(1, 0),
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			time.Sleep(tt.sleepDuration)
+			time.Sleep(time.Millisecond)
+			got := now()
+			if !got.Equal(tt.want) {
+				t.Errorf("now() = %s, want %s", got.Format(time.RFC3339), tt.want.Format(time.RFC3339))
+			}
+		})
+	}
+}