Skip to content

Commit 9a5fa22

Browse files
authored
Merge pull request src-d#133 from smola/temp-database-test
test: ensure temporary database is used
2 parents b4034b3 + c359b2b commit 9a5fa22

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

common_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestCommon(t *testing.T) {
2323
}
2424

2525
type BaseQueueSuite struct {
26-
suite.Suite
26+
test.Suite
2727
broker queue.Broker
2828
queue queue.Queue
2929
queueName string
@@ -36,10 +36,12 @@ func (s *BaseQueueSuite) SetupSuite() {
3636

3737
func (s *BaseQueueSuite) SetupTest() {
3838
s.connectQueue()
39+
s.Suite.Setup()
3940
}
4041

4142
func (s *BaseQueueSuite) TearDownTest() {
4243
s.NoError(s.broker.Close())
44+
s.Suite.TearDown()
4345
}
4446

4547
func (s *BaseQueueSuite) connectQueue() {

producer_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import (
99
"github.com/satori/go.uuid"
1010
"github.com/stretchr/testify/require"
1111
"github.com/stretchr/testify/suite"
12-
"gopkg.in/src-d/core-retrieval.v0"
13-
rmodel "gopkg.in/src-d/core-retrieval.v0/model"
12+
"gopkg.in/src-d/core-retrieval.v0/model"
1413
"gopkg.in/src-d/framework.v0/queue"
1514
)
1615

@@ -36,18 +35,14 @@ func (s *ProducerSuite) SetupSuite() {
3635
}
3736

3837
func (s *ProducerSuite) newProducer() *Producer {
39-
DropTables("repository")
40-
DropIndexes("idx_endpoints")
41-
CreateRepositoryTable()
42-
storer := core.ModelRepositoryStore()
43-
38+
storer := model.NewRepositoryStore(s.DB)
4439
return NewProducer(NewMentionJobIter(s.mentionsQueue, storer), s.queue)
4540
}
4641

4742
func (s *ProducerSuite) newJob() *queue.Job {
4843
j := queue.NewJob()
49-
m := &rmodel.Mention{
50-
VCS: rmodel.GIT,
44+
m := &model.Mention{
45+
VCS: model.GIT,
5146
Provider: "TEST_PROVIDER",
5247
Endpoint: testEndpoint,
5348
}

0 commit comments

Comments
 (0)