Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up tests package

pull/9349/head
Edd Robinson 2018-01-21 09:53:57 -08:00
parent 42c3adeffc
commit 648040393c
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/backup_restore_test.go
View File

@ -9,6 +9,7 @@ import (
"time"
"fmt"
"github.com/influxdata/influxdb/cmd/influxd/backup"
"github.com/influxdata/influxdb/cmd/influxd/restore"
)
@ -68,9 +69,11 @@ func TestServer_BackupAndRestore(t *testing.T) {
// wait for the snapshot to write
time.Sleep(time.Second)
res, err := s.Query(`show series on mydb; show retention policies on mydb`)
if _, err := s.Query(`show series on mydb; show retention policies on mydb`); err != nil {
t.Fatalf("error querying: %s", err.Error())
}
res, err = s.Query(`select * from "mydb"."forever"."myseries"`)
res, err := s.Query(`select * from "mydb"."forever"."myseries"`)
if err != nil {
t.Fatalf("error querying: %s", err.Error())
}
@ -185,7 +188,7 @@ func TestServer_BackupAndRestore(t *testing.T) {
t.Fatalf("error backing up: %s, hostAddress: %s", err.Error(), hostAddress)
}
res, err = s.Query(`drop database mydb; drop database mydbbak; drop database mydbbak2;`)
_, err = s.Query(`drop database mydb; drop database mydbbak; drop database mydbbak2;`)
if err != nil {
t.Fatalf("Error dropping databases %s", err.Error())
}

21
tests/server_helpers.go
View File

@ -107,10 +107,7 @@ func (s *RemoteServer) CreateDatabaseAndRetentionPolicy(db string, rp *meta.Rete
}
_, err := s.HTTPPost(s.URL()+"/query?q="+stmt, nil)
if err != nil {
return err
}
return nil
return err
}
func (s *RemoteServer) CreateSubscription(database, rp, name, mode string, destinations []string) error {
@ -123,20 +120,14 @@ func (s *RemoteServer) CreateSubscription(database, rp, name, mode string, desti
name, database, rp, mode, strings.Join(dests, ","))
_, err := s.HTTPPost(s.URL()+"/query?q="+stmt, nil)
if err != nil {
return err
}
return nil
return err
}
func (s *RemoteServer) DropDatabase(db string) error {
stmt := fmt.Sprintf("DROP+DATABASE+%s", db)
_, err := s.HTTPPost(s.URL()+"/query?q="+stmt, nil)
if err != nil {
return err
}
return nil
return err
}
// Reset attempts to remove all database state by dropping everything
@ -580,11 +571,7 @@ func RemoteEnabled() bool {
}
func expectPattern(exp, act string) bool {
re := regexp.MustCompile(exp)
if !re.MatchString(act) {
return false
}
return true
return regexp.MustCompile(exp).MatchString(act)
}
type Query struct {