PT-1706 Updated travis.yml

This commit is contained in:
Carlos Salguero
2019-04-03 10:12:18 -03:00
parent cdea59e688
commit 12c866c9a4
2 changed files with 59 additions and 32 deletions

View File

@@ -31,7 +31,7 @@ before_script:
- dep ensure - dep ensure
script: script:
- go test -timeout 1m ./src/... - go test -timeout 20m ./src/...
allow_failures: allow_failures:
- tip - tip

View File

@@ -29,32 +29,51 @@ func TestGetOpCounterStats(t *testing.T) {
database := pmgomock.NewMockDatabaseManager(ctrl) database := pmgomock.NewMockDatabaseManager(ctrl)
ss := proto.ServerStatus{} ss := proto.ServerStatus{}
tutil.LoadJson("test/sample/serverstatus.json", &ss) if err := tutil.LoadJson("test/sample/serverstatus.json", &ss); err != nil {
t.Fatalf("Cannot load sample file: %s", err)
}
session.EXPECT().DB("admin").Return(database) session.EXPECT().DB("admin").Return(database)
database.EXPECT().Run(bson.D{{"serverStatus", 1}, {"recordStats", 1}}, gomock.Any()).SetArg(1, ss) database.EXPECT().Run(bson.D{
{Name: "serverStatus", Value: 1},
{Name: "recordStats", Value: 1},
}, gomock.Any()).SetArg(1, ss)
session.EXPECT().DB("admin").Return(database) session.EXPECT().DB("admin").Return(database)
database.EXPECT().Run(bson.D{{"serverStatus", 1}, {"recordStats", 1}}, gomock.Any()).SetArg(1, ss) database.EXPECT().Run(bson.D{
{Name: "serverStatus", Value: 1},
{Name: "recordStats", Value: 1},
}, gomock.Any()).SetArg(1, ss)
session.EXPECT().DB("admin").Return(database) session.EXPECT().DB("admin").Return(database)
database.EXPECT().Run(bson.D{{"serverStatus", 1}, {"recordStats", 1}}, gomock.Any()).SetArg(1, ss) database.EXPECT().Run(bson.D{
{Name: "serverStatus", Value: 1},
{Name: "recordStats", Value: 1},
}, gomock.Any()).SetArg(1, ss)
session.EXPECT().DB("admin").Return(database) session.EXPECT().DB("admin").Return(database)
database.EXPECT().Run(bson.D{{"serverStatus", 1}, {"recordStats", 1}}, gomock.Any()).SetArg(1, ss) database.EXPECT().Run(bson.D{
{Name: "serverStatus", Value: 1},
{Name: "recordStats", Value: 1},
}, gomock.Any()).SetArg(1, ss)
session.EXPECT().DB("admin").Return(database) session.EXPECT().DB("admin").Return(database)
database.EXPECT().Run(bson.D{{"serverStatus", 1}, {"recordStats", 1}}, gomock.Any()).SetArg(1, ss) database.EXPECT().Run(bson.D{
{Name: "serverStatus", Value: 1},
{Name: "recordStats", Value: 1},
}, gomock.Any()).SetArg(1, ss)
ss = addToCounters(ss, 1) ss = addToCounters(ss, 1)
session.EXPECT().DB("admin").Return(database) session.EXPECT().DB("admin").Return(database)
database.EXPECT().Run(bson.D{{"serverStatus", 1}, {"recordStats", 1}}, gomock.Any()).SetArg(1, ss) database.EXPECT().Run(bson.D{
{Name: "serverStatus", Value: 1}, {Name: "recordStats", Value: 1},
}, gomock.Any()).SetArg(1, ss)
var sampleCount int = 5 sampleCount := 5
var sampleRate time.Duration = 10 * time.Millisecond // in seconds sampleRate := 10 * time.Millisecond // in seconds
expect := TimedStats{Min: 0, Max: 0, Total: 0, Avg: 0} expect := TimedStats{Min: 0, Max: 0, Total: 0, Avg: 0}
os, err := GetOpCountersStats(session, sampleCount, sampleRate) os, err := getOpCountersStats(session, sampleCount, sampleRate)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@@ -67,7 +86,7 @@ func TestGetOpCounterStats(t *testing.T) {
func TestSecurityOpts(t *testing.T) { func TestSecurityOpts(t *testing.T) {
cmdopts := []proto.CommandLineOptions{ cmdopts := []proto.CommandLineOptions{
// 1 // 1
proto.CommandLineOptions{ {
Parsed: proto.Parsed{ Parsed: proto.Parsed{
Net: proto.Net{ Net: proto.Net{
SSL: proto.SSL{ SSL: proto.SSL{
@@ -81,7 +100,7 @@ func TestSecurityOpts(t *testing.T) {
}, },
}, },
// 2 // 2
proto.CommandLineOptions{ {
Parsed: proto.Parsed{ Parsed: proto.Parsed{
Net: proto.Net{ Net: proto.Net{
SSL: proto.SSL{ SSL: proto.SSL{
@@ -95,7 +114,7 @@ func TestSecurityOpts(t *testing.T) {
}, },
}, },
// 3 // 3
proto.CommandLineOptions{ {
Parsed: proto.Parsed{ Parsed: proto.Parsed{
Net: proto.Net{ Net: proto.Net{
SSL: proto.SSL{ SSL: proto.SSL{
@@ -109,7 +128,7 @@ func TestSecurityOpts(t *testing.T) {
}, },
}, },
// 4 // 4
proto.CommandLineOptions{ {
Parsed: proto.Parsed{ Parsed: proto.Parsed{
Net: proto.Net{ Net: proto.Net{
SSL: proto.SSL{ SSL: proto.SSL{
@@ -123,7 +142,7 @@ func TestSecurityOpts(t *testing.T) {
}, },
}, },
// 5 // 5
proto.CommandLineOptions{ {
Parsed: proto.Parsed{ Parsed: proto.Parsed{
Net: proto.Net{ Net: proto.Net{
SSL: proto.SSL{ SSL: proto.SSL{
@@ -143,7 +162,7 @@ func TestSecurityOpts(t *testing.T) {
expect := []*security{ expect := []*security{
// 1 // 1
&security{ {
Users: 1, Users: 1,
Roles: 2, Roles: 2,
Auth: "disabled", Auth: "disabled",
@@ -153,7 +172,7 @@ func TestSecurityOpts(t *testing.T) {
WarningMsgs: nil, WarningMsgs: nil,
}, },
// 2 // 2
&security{ {
Users: 1, Users: 1,
Roles: 2, Roles: 2,
Auth: "enabled", Auth: "enabled",
@@ -162,7 +181,7 @@ func TestSecurityOpts(t *testing.T) {
WarningMsgs: nil, WarningMsgs: nil,
}, },
// 3 // 3
&security{ {
Users: 1, Users: 1,
Roles: 2, Roles: 2,
Auth: "enabled", Auth: "enabled",
@@ -172,7 +191,7 @@ func TestSecurityOpts(t *testing.T) {
WarningMsgs: nil, WarningMsgs: nil,
}, },
// 4 // 4
&security{ {
Users: 1, Users: 1,
Roles: 2, Roles: 2,
Auth: "disabled", Auth: "disabled",
@@ -182,7 +201,7 @@ func TestSecurityOpts(t *testing.T) {
WarningMsgs: nil, WarningMsgs: nil,
}, },
// 5 // 5
&security{ {
Users: 1, Users: 1,
Roles: 2, Roles: 2,
Auth: "enabled", Auth: "enabled",
@@ -204,7 +223,9 @@ func TestSecurityOpts(t *testing.T) {
for i, cmd := range cmdopts { for i, cmd := range cmdopts {
session.EXPECT().DB("admin").Return(database) session.EXPECT().DB("admin").Return(database)
database.EXPECT().Run(bson.D{{"getCmdLineOpts", 1}, {"recordStats", 1}}, gomock.Any()).SetArg(1, cmd) database.EXPECT().Run(bson.D{
{Name: "getCmdLineOpts", Value: 1}, {Name: "recordStats", Value: 1},
}, gomock.Any()).SetArg(1, cmd)
session.EXPECT().Clone().Return(session) session.EXPECT().Clone().Return(session)
session.EXPECT().SetMode(mgo.Strong, true) session.EXPECT().SetMode(mgo.Strong, true)
@@ -218,7 +239,7 @@ func TestSecurityOpts(t *testing.T) {
rolesCol.EXPECT().Count().Return(2, nil) rolesCol.EXPECT().Count().Return(2, nil)
session.EXPECT().Close().Return() session.EXPECT().Close().Return()
got, err := GetSecuritySettings(session, "3.2") got, err := getSecuritySettings(session, "3.2")
if err != nil { if err != nil {
t.Errorf("cannot get sec settings: %v", err) t.Errorf("cannot get sec settings: %v", err)
@@ -326,7 +347,9 @@ func TestGetChunks(t *testing.T) {
col := pmgomock.NewMockCollectionManager(ctrl) col := pmgomock.NewMockCollectionManager(ctrl)
var res []proto.ChunksByCollection var res []proto.ChunksByCollection
tutil.LoadJson("test/sample/chunks.json", &res) if err := tutil.LoadJson("test/sample/chunks.json", &res); err != nil {
t.Errorf("Cannot load samples file: %s", err)
}
pipe.EXPECT().All(gomock.Any()).SetArg(0, res) pipe.EXPECT().All(gomock.Any()).SetArg(0, res)
@@ -356,10 +379,12 @@ func TestIntegrationGetChunks(t *testing.T) {
server.SetPath(tempDir) server.SetPath(tempDir)
session := pmgo.NewSessionManager(server.Session()) session := pmgo.NewSessionManager(server.Session())
session.DB("config").C("chunks").Insert(bson.M{"ns": "samples.col1", "count": 2}) if err := session.DB("config").C("chunks").Insert(bson.M{"ns": "samples.col1", "count": 2}); err != nil {
t.Errorf("Cannot insert sample data: %s", err)
}
want := []proto.ChunksByCollection{ want := []proto.ChunksByCollection{
proto.ChunksByCollection{ {
ID: "samples.col1", ID: "samples.col1",
Count: 1, Count: 1,
}, },
@@ -373,7 +398,9 @@ func TestIntegrationGetChunks(t *testing.T) {
t.Errorf("Invalid integration chunks count.\ngot: %+v\nwant: %+v", got, want) t.Errorf("Invalid integration chunks count.\ngot: %+v\nwant: %+v", got, want)
} }
server.Session().DB("config").DropDatabase() if err := server.Session().DB("config").DropDatabase(); err != nil {
t.Logf("Cannot drop config database (cleanup): %s", err)
}
server.Session().Close() server.Session().Close()
server.Stop() server.Stop()
@@ -397,11 +424,11 @@ func TestParseArgs(t *testing.T) {
{ {
args: []string{TOOLNAME}, // arg[0] is the command itself args: []string{TOOLNAME}, // arg[0] is the command itself
want: &options{ want: &options{
Host: DEFAULT_HOST, Host: DefaultHost,
LogLevel: DEFAULT_LOGLEVEL, LogLevel: DefaultLogLevel,
AuthDB: DEFAULT_AUTHDB, AuthDB: DefaultAuthDB,
RunningOpsSamples: DEFAULT_RUNNINGOPSSAMPLES, RunningOpsSamples: DefaultRunningOpsSamples,
RunningOpsInterval: DEFAULT_RUNNINGOPSINTERVAL, RunningOpsInterval: DefaultRunningOpsInterval,
OutputFormat: "text", OutputFormat: "text",
}, },
}, },