Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mongo: use SKIP_DEP_TESTS again. regressed in recent refactor. 

Noticed because 'make presubmit' was breaking when offline.

Change-Id: I1afd12eb2ae8f504018b8a30a91d2d2e87d35999
This commit is contained in:
Brad Fitzpatrick 2013-12-14 15:15:09 +01:00
parent 60e05bf90b
commit 80ea29de8f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/index/mongo/mongoindex_test.go
View File

@ -40,7 +40,18 @@ func checkMongoUp() {
mongoNotAvailable = !mongo.Ping("localhost", 500*time.Millisecond)
}
func skipOrFailIfNoMongo(t *testing.T) {
once.Do(checkMongoUp)
if mongoNotAvailable {
err := errors.New("Not running; start a mongoDB daemon on the standard port (27017). The \"keys\" collection in the \"camlitest\" database will be used.")
test.DependencyErrorOrSkip(t)
t.Fatalf("Mongo not available locally for testing: %v", err)
}
}
func newSorted(t *testing.T) (kv sorted.KeyValue, cleanup func()) {
skipOrFailIfNoMongo(t)
// connect without credentials and wipe the database
cfg := jsonconfig.Obj{
"host": "localhost",
@ -73,12 +84,7 @@ func TestSortedKV(t *testing.T) {
type mongoTester struct{}
func (mongoTester) test(t *testing.T, tfn func(*testing.T, func() *index.Index)) {
once.Do(checkMongoUp)
if mongoNotAvailable {
err := errors.New("Not running; start a mongoDB daemon on the standard port (27017). The \"keys\" collection in the \"camlitest\" database will be used.")
test.DependencyErrorOrSkip(t)
t.Fatalf("Mongo not available locally for testing: %v", err)
}
skipOrFailIfNoMongo(t)
defer test.TLog(t)()
var cleanups []func()
defer func() {