Remove unnecessary test indirection

This commit is contained in:
Justin Li 2014-07-15 21:14:20 -04:00
parent 586b6852de
commit f20fea7db0

View file

@ -14,47 +14,33 @@ import (
"github.com/chihaya/bencode"
"github.com/chihaya/chihaya/config"
"github.com/chihaya/chihaya/drivers/backend"
"github.com/chihaya/chihaya/drivers/tracker"
"github.com/chihaya/chihaya/models"
_ "github.com/chihaya/chihaya/drivers/backend/noop"
_ "github.com/chihaya/chihaya/drivers/tracker/memory"
)
type primer func(tracker.Pool, backend.Conn) error
func (t *Tracker) prime(p primer) error {
return p(t.tp, t.bc)
}
func loadTestData(tkr *Tracker) (err error) {
return tkr.prime(func(tp tracker.Pool, bc backend.Conn) (err error) {
conn, err := tp.Get()
conn, err := tkr.tp.Get()
if err != nil {
return
}
users := []string{
"yby47f04riwpndba456rqxtmifenqxx1",
"yby47f04riwpndba456rqxtmifenqxx2",
"yby47f04riwpndba456rqxtmifenqxx3",
}
for i, passkey := range users {
err = conn.PutUser(&models.User{
ID: 1,
Passkey: "yby47f04riwpndba456rqxtmifenqxx1",
ID: uint64(i + 1),
Passkey: passkey,
})
if err != nil {
return
}
err = conn.PutUser(&models.User{
ID: 2,
Passkey: "yby47f04riwpndba456rqxtmifenqxx2",
})
if err != nil {
return
}
err = conn.PutUser(&models.User{
ID: 3,
Passkey: "yby47f04riwpndba456rqxtmifenqxx3",
})
if err != nil {
return
}
err = conn.PutClient("TR2820")
@ -94,9 +80,7 @@ func loadTestData(tkr *Tracker) (err error) {
Port: 34000,
Left: 0,
})
return
})
}
func testRoute(cfg *config.Config, url string) ([]byte, error) {