Ensure shard tests run with both indexes

pull/8685/head
Edd Robinson 2017-08-09 16:30:09 +01:00
parent e732cb7a39
commit 9c12607c3e
2 changed files with 725 additions and 645 deletions

View File

@ -40,14 +40,18 @@ func TestMain(m *testing.M) {
benchServer = OpenDefaultServer(c)
// Run test suite.
fmt.Printf("============= Running all tests for %q index =============\n", indexType)
if testing.Verbose() {
fmt.Printf("============= Running all tests for %q index =============\n", indexType)
}
if thisr := m.Run(); r == 0 {
r = thisr // We'll always remember the first time r is non-zero
}
// Cleanup
benchServer.Close()
fmt.Println()
if testing.Verbose() {
fmt.Println()
}
}
os.Exit(r)
}
@ -8413,7 +8417,7 @@ func TestServer_Query_LargeTimestamp(t *testing.T) {
// Open a new server with the same configuration file.
// This is to ensure the meta data was marshaled correctly.
s2 := OpenServer((s.(*LocalServer)).Config)
defer s2.Close()
defer s2.(*LocalServer).Server.Close()
for _, query := range test.queries {
t.Run(query.name, func(t *testing.T) {

File diff suppressed because it is too large Load Diff