a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fine, update this file too

This commit is contained in:
Azareal 2021-05-02 18:54:40 +10:00
parent fc5b29e648
commit 6766fd659c
1 changed files with 118 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

225
general_test.go
View File

@ -46,11 +46,10 @@ func ResetTables() (err error) {
return installAdapter.InitialData() return installAdapter.InitialData()
} }
func gloinit() (err error) { func gloinit() (e error) {
if gloinited { if gloinited {
return nil return nil
} }
// TODO: Make these configurable via flags to the go test command // TODO: Make these configurable via flags to the go test command
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
@ -59,22 +58,25 @@ func gloinit() (err error) {
//nogrouplog = true //nogrouplog = true
c.StartTime = time.Now() c.StartTime = time.Now()
err = c.LoadConfig() ws := func(e error) error {
if err != nil { return errors.WithStack(e)
return errors.WithStack(err)
} }
err = c.ProcessConfig() e = c.LoadConfig()
if err != nil { if e != nil {
return errors.WithStack(err) return ws(e)
}
e = c.ProcessConfig()
if e != nil {
return ws(e)
} }
err = c.InitTemplates() e = c.InitTemplates()
if err != nil { if e != nil {
return errors.WithStack(err) return ws(e)
} }
c.Themes, err = c.NewThemeList() c.Themes, e = c.NewThemeList()
if err != nil { if e != nil {
return errors.WithStack(err) return ws(e)
} }
c.TopicListThaw = c.NewTestThaw() c.TopicListThaw = c.NewTestThaw()
c.SwitchToTestDB() c.SwitchToTestDB()
@ -82,36 +84,45 @@ func gloinit() (err error) {
var ok bool var ok bool
installAdapter, ok = install.Lookup(dbAdapter) installAdapter, ok = install.Lookup(dbAdapter)
if !ok { if !ok {
return errors.WithStack(errors.New("We couldn't find the adapter '" + dbAdapter + "'")) return ws(errors.New("We couldn't find the adapter '" + dbAdapter + "'"))
} }
installAdapter.SetConfig(c.DbConfig.Host, c.DbConfig.Username, c.DbConfig.Password, c.DbConfig.Dbname, c.DbConfig.Port) installAdapter.SetConfig(c.DbConfig.Host, c.DbConfig.Username, c.DbConfig.Password, c.DbConfig.Dbname, c.DbConfig.Port)
err = ResetTables() e = ResetTables()
if err != nil { if e != nil {
return err return e
} }
err = InitDatabase() e = InitDatabase()
if err != nil { if e != nil {
return err return e
} }
err = afterDBInit() e = afterDBInit()
if err != nil { if e != nil {
return err return e
} }
router, err = NewGenRouter(http.FileServer(http.Dir("./uploads"))) rrcfg := rcfg()
if err != nil { rrcfg.DisableTick = false
return errors.WithStack(err) router, e = NewGenRouter(rrcfg)
if e != nil {
return ws(e)
} }
gloinited = true gloinited = true
return nil return nil
} }
func rcfg() *RouterConfig {
return &RouterConfig{
Uploads: http.FileServer(http.Dir("./uploads")),
DisableTick: true,
}
}
func init() { func init() {
if err := gloinit(); err != nil { if e := gloinit(); e != nil {
log.Print("Something bad happened") log.Print("Something bad happened")
//debug.PrintStack() //debug.PrintStack()
log.Fatalf("%+v\n", err) log.Fatalf("%+v\n", e)
} }
} }
@ -147,9 +158,9 @@ func BenchmarkTopicAdminRouteParallel(b *testing.B) {
if !ok { if !ok {
b.Fatal("Mysterious error!") b.Fatal("Mysterious error!")
} }
head, err := c.UserCheck(w, reqAdmin, &user) head, e := c.UserCheck(w, reqAdmin, &user)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
//w.Body.Reset() //w.Body.Reset()
routes.ViewTopic(w, reqAdmin, &user, head, "1") routes.ViewTopic(w, reqAdmin, &user, head, "1")
@ -165,17 +176,17 @@ func BenchmarkTopicAdminRouteParallel(b *testing.B) {
func BenchmarkTopicAdminRouteParallelWithRouter(b *testing.B) { func BenchmarkTopicAdminRouteParallelWithRouter(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -223,17 +234,17 @@ func BenchmarkTopicGuestAdminRouteParallelWithRouterPre(b *testing.B) {
func BenchmarkTopicGuestAdminRouteParallelWithRouter(b *testing.B) { func BenchmarkTopicGuestAdminRouteParallelWithRouter(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -282,17 +293,17 @@ func BenchmarkTopicGuestAdminRouteParallelWithRouterPre2(b *testing.B) {
func BenchmarkTopicGuestAdminRouteParallelWithRouterGC(b *testing.B) { func BenchmarkTopicGuestAdminRouteParallelWithRouterGC(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -349,9 +360,9 @@ func BenchmarkTopicGuestRouteParallel(b *testing.B) {
req := httptest.NewRequest("get", "/topic/hm."+benchTid, bytes.NewReader(nil)) req := httptest.NewRequest("get", "/topic/hm."+benchTid, bytes.NewReader(nil))
user := c.GuestUser user := c.GuestUser
head, err := c.UserCheck(w, req, &user) head, e := c.UserCheck(w, req, &user)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
//w.Body.Reset() //w.Body.Reset()
routes.ViewTopic(w, req, &user, head, "1") routes.ViewTopic(w, req, &user, head, "1")
@ -372,17 +383,17 @@ func BenchmarkForumsRouteAdminParallelWithRouterGC2Pre(b *testing.B) {
func BenchmarkForumsRouteAdminParallelWithRouterGC2(b *testing.B) { func BenchmarkForumsRouteAdminParallelWithRouterGC2(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -420,17 +431,17 @@ func BenchmarkForumsRouteAdminParallelWithRouterGCBrotliPre(b *testing.B) {
func BenchmarkForumsRouteAdminParallelWithRouterGCBrotli(b *testing.B) { func BenchmarkForumsRouteAdminParallelWithRouterGCBrotli(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -472,17 +483,17 @@ func BenchmarkTopicRouteAdminParallelWithRouterGC2Pre(b *testing.B) {
func BenchmarkTopicRouteAdminParallelWithRouterGC2(b *testing.B) { func BenchmarkTopicRouteAdminParallelWithRouterGC2(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -520,17 +531,17 @@ func BenchmarkTopicRouteAdminParallelWithRouterGCBrotliPre(b *testing.B) {
func BenchmarkTopicRouteAdminParallelWithRouterGCBrotli(b *testing.B) { func BenchmarkTopicRouteAdminParallelWithRouterGCBrotli(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -571,17 +582,17 @@ func BenchmarkTopicsRouteAdminParallelWithRouterGC2Pre(b *testing.B) {
func BenchmarkTopicsRouteAdminParallelWithRouterGC2(b *testing.B) { func BenchmarkTopicsRouteAdminParallelWithRouterGC2(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -619,17 +630,17 @@ func BenchmarkTopicsRouteAdminParallelWithRouterGCBrotliPre(b *testing.B) {
func BenchmarkTopicsRouteAdminParallelWithRouterGCBrotli(b *testing.B) { func BenchmarkTopicsRouteAdminParallelWithRouterGCBrotli(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -668,17 +679,17 @@ func BenchmarkTopicsRouteAdminParallelWithRouterGCGzipPre(b *testing.B) {
func BenchmarkTopicsRouteAdminParallelWithRouterGCGzip(b *testing.B) { func BenchmarkTopicsRouteAdminParallelWithRouterGCGzip(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -744,17 +755,17 @@ func BenchmarkAlertsRouteAdminParallelWithRouterGCPre(b *testing.B) {
func BenchmarkAlertsRouteAdminParallelWithRouterGC(b *testing.B) { func BenchmarkAlertsRouteAdminParallelWithRouterGC(b *testing.B) {
binit(b) binit(b)
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
cfg := NewStashConfig() cfg := NewStashConfig()
c.Dev.DebugMode = false c.Dev.DebugMode = false
c.Dev.SuperDebug = false c.Dev.SuperDebug = false
admin, err := c.Users.Get(1) admin, e := c.Users.Get(1)
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
if !admin.IsAdmin { if !admin.IsAdmin {
b.Fatal("UID1 is not an admin") b.Fatal("UID1 is not an admin")
@ -862,9 +873,9 @@ func (cfg *StashConfig) Restore() {
} }
func benchRoute(b *testing.B, path string) func(*testing.PB) { func benchRoute(b *testing.B, path string) func(*testing.PB) {
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
return func(pb *testing.PB) { return func(pb *testing.PB) {
for pb.Next() { for pb.Next() {
@ -883,9 +894,9 @@ func benchRoute(b *testing.B, path string) func(*testing.PB) {
} }
func benchRouteNoError(b *testing.B, path string) func(*testing.PB) { func benchRouteNoError(b *testing.B, path string) func(*testing.PB) {
router, err := NewGenRouter(http.FileServer(http.Dir("./uploads"))) router, e := NewGenRouter(rcfg())
if err != nil { if e != nil {
b.Fatal(err) b.Fatal(e)
} }
return func(pb *testing.PB) { return func(pb *testing.PB) {
for pb.Next() { for pb.Next() {