From 01ba236e407578d051651921f7cece4857829c3d Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Thu, 24 May 2018 20:35:43 -0500
Subject: [PATCH] fix test on time

---
 app/rest/api/rss_test.go       | 4 ++--
 app/rest/auth/provider_test.go | 8 ++++----
 app/store/engine/bolt_test.go  | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/rest/api/rss_test.go b/app/rest/api/rss_test.go
index b45a0453..9e5302b3 100644
--- a/app/rest/api/rss_test.go
+++ b/app/rest/api/rss_test.go
@@ -154,10 +154,10 @@ func TestServer_RssWithReply(t *testing.T) {
 
 func waitOnMinChange() {
 	for {
-		if time.Now().Second() != 59 {
+		if time.Now().Nanosecond() > 500000000 {
 			break
 		}
-		time.Sleep(10 * time.Millisecond)
+		time.Sleep(10 * time.Nanosecond)
 	}
 }
 
diff --git a/app/rest/auth/provider_test.go b/app/rest/auth/provider_test.go
index 79893c42..c8e8b7e2 100644
--- a/app/rest/auth/provider_test.go
+++ b/app/rest/auth/provider_test.go
@@ -20,7 +20,7 @@ import (
 
 func TestLogin(t *testing.T) {
 
-	_, ts, ots := mockProvider(t, 8981, 8982)
+	ts, ots := mockProvider(t, 8981, 8982)
 	defer func() {
 		ts.Close()
 		ots.Close()
@@ -63,7 +63,7 @@ func TestLogin(t *testing.T) {
 
 func TestLogout(t *testing.T) {
 
-	_, ts, ots := mockProvider(t, 8691, 8692)
+	ts, ots := mockProvider(t, 8691, 8692)
 	defer func() {
 		ts.Close()
 		ots.Close()
@@ -99,7 +99,7 @@ func TestInitProvider(t *testing.T) {
 	assert.Equal(t, "test", res.Name)
 }
 
-func mockProvider(t *testing.T, loginPort, authPort int) (*Provider, *http.Server, *http.Server) {
+func mockProvider(t *testing.T, loginPort, authPort int) (*http.Server, *http.Server) {
 
 	provider := Provider{
 		Name: "mock",
@@ -170,5 +170,5 @@ func mockProvider(t *testing.T, loginPort, authPort int) (*Provider, *http.Serve
 	go ts.ListenAndServe()
 
 	time.Sleep(time.Millisecond * 100) // let the start
-	return &provider, ts, oauth
+	return ts, oauth
 }
diff --git a/app/store/engine/bolt_test.go b/app/store/engine/bolt_test.go
index 4ff19dba..21c06688 100644
--- a/app/store/engine/bolt_test.go
+++ b/app/store/engine/bolt_test.go
@@ -33,8 +33,8 @@ func TestBoltDB_CreateAndFind(t *testing.T) {
 }
 
 func TestBoltDB_Delete(t *testing.T) {
-	b := prep(t)
 	defer os.Remove(testDb)
+	b := prep(t)
 
 	loc := store.Locator{URL: "https://radio-t.com", SiteID: "radio-t"}
 	res, err := b.Find(loc, "time")
@@ -285,6 +285,7 @@ func TestBoltDB_Ref(t *testing.T) {
 // makes new boltdb, put two records
 func prep(t *testing.T) *BoltDB {
 	os.Remove(testDb)
+	time.Sleep(10 * time.Millisecond)
 
 	boltStore, err := NewBoltDB(bolt.Options{}, BoltSite{FileName: testDb, SiteID: "radio-t"})
 	assert.Nil(t, err)