From c359b2b1eaf6d2530a935d5aacc2881191eb9573 Mon Sep 17 00:00:00 2001
From: "Santiago M. Mola" <santi@mola.io>
Date: Wed, 2 Aug 2017 10:15:25 +0200
Subject: [PATCH] test: ensure temporary database is used

ProducerSuite was still using a global database instead of a temporary
one.
---
 common_test.go   |  4 +++-
 producer_test.go | 13 ++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/common_test.go b/common_test.go
index af0c0104..ec36e9a4 100644
--- a/common_test.go
+++ b/common_test.go
@@ -23,7 +23,7 @@ func TestCommon(t *testing.T) {
 }
 
 type BaseQueueSuite struct {
-	suite.Suite
+	test.Suite
 	broker    queue.Broker
 	queue     queue.Queue
 	queueName string
@@ -36,10 +36,12 @@ func (s *BaseQueueSuite) SetupSuite() {
 
 func (s *BaseQueueSuite) SetupTest() {
 	s.connectQueue()
+	s.Suite.Setup()
 }
 
 func (s *BaseQueueSuite) TearDownTest() {
 	s.NoError(s.broker.Close())
+	s.Suite.TearDown()
 }
 
 func (s *BaseQueueSuite) connectQueue() {
diff --git a/producer_test.go b/producer_test.go
index 9d51ec5b..133dd05f 100644
--- a/producer_test.go
+++ b/producer_test.go
@@ -9,8 +9,7 @@ import (
 	"github.com/satori/go.uuid"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"gopkg.in/src-d/core-retrieval.v0"
-	rmodel "gopkg.in/src-d/core-retrieval.v0/model"
+	"gopkg.in/src-d/core-retrieval.v0/model"
 	"gopkg.in/src-d/framework.v0/queue"
 )
 
@@ -36,18 +35,14 @@ func (s *ProducerSuite) SetupSuite() {
 }
 
 func (s *ProducerSuite) newProducer() *Producer {
-	DropTables("repository")
-	DropIndexes("idx_endpoints")
-	CreateRepositoryTable()
-	storer := core.ModelRepositoryStore()
-
+	storer := model.NewRepositoryStore(s.DB)
 	return NewProducer(NewMentionJobIter(s.mentionsQueue, storer), s.queue)
 }
 
 func (s *ProducerSuite) newJob() *queue.Job {
 	j := queue.NewJob()
-	m := &rmodel.Mention{
-		VCS:      rmodel.GIT,
+	m := &model.Mention{
+		VCS:      model.GIT,
 		Provider: "TEST_PROVIDER",
 		Endpoint: testEndpoint,
 	}