Worked on tests and benchmarking.

Author: adewes

Makefile

@@ -3,7 +3,7 @@
 SHELL := /bin/bash
 
 GOFLAGS ?= -ldflags=\"-extldflags=-static\" $(GOFLAGS:)
-BENCHARGS ?= -run=NONE -bench=.
+BENCHARGS ?= -run=NONE -bench=. -benchmem
 
 export KIEBITZ_TEST = yes
 

cmd/helpers/testing.go

@@ -44,7 +44,7 @@ func benchmark(settings *services.Settings) func(c *cli.Context) error {
 		providers := c.Int("providers")
 		slots := c.Int("slots")
 
-		if !settings.Test && !safetyOff {
+		if !*settings.Test && !safetyOff {
 			return fmt.Errorf("Non-test system detected, aborting! Override this by setting --safetyOff.")
 		}
 

forms/settings.go

@@ -405,6 +405,7 @@ var SettingsForm = forms.Form{
 		{
 			Name: "database",
 			Validators: []forms.Validator{
+				forms.IsOptional{},
 				forms.IsStringMap{
 					Form: &DatabaseForm,
 				},

helpers/database.go

@@ -21,6 +21,9 @@ import (
 )
 
 func InitializeDatabase(settings *services.Settings) (services.Database, error) {
+	if settings.Database == nil {
+		return nil, nil
+	}
 	definition := settings.Definitions.DatabaseDefinitions[settings.Database.Type]
 	if db, err := definition.Maker(settings.Database.Settings); err != nil {
 		return nil, err

servers/app_confirm_provider_test.go

@@ -64,7 +64,7 @@ func TestConfirmProvider(t *testing.T) {
 	var fixturesConfig = []at.FC{
 
 		// we create the settings
-		at.FC{af.Settings{definitions.Default}, "settings"},
+		at.FC{af.Settings{Definitions: definitions.Default}, "settings"},
 
 		// we create the appointments API
 		at.FC{af.AppointmentsServer{}, "appointmentsServer"},

…rvers/app_appointments_benchmark_test.go …pointments_by_zip_code_benchmark_test.goservers/app_appointments_benchmark_test.go renamed to servers/app_get_appointments_by_zip_code_benchmark_test.go servers/app_appointments_benchmark_test.go renamed to servers/app_get_appointments_by_zip_code_benchmark_test.go

@@ -25,12 +25,12 @@ import (
 	"testing"
 )
 
-func BenchmarkAppointmentsEndpoints(b *testing.B) {
+func BenchmarkGetAppointmentsByZipCode(b *testing.B) {
 
 	var fixturesConfig = []at.FC{
 
 		// we create the settings
-		at.FC{af.Settings{definitions.Default}, "settings"},
+		at.FC{af.Settings{LogLevel: services.InfoLogLevel, Definitions: definitions.Default}, "settings"},
 
 		// we create the appointments API
 		at.FC{af.AppointmentsServer{}, "appointmentsServer"},

servers/app_publish_appointments_test.go

@@ -28,7 +28,7 @@ func TestPublishAppointments(t *testing.T) {
 	var fixturesConfig = []at.FC{
 
 		// we create the settings
-		at.FC{af.Settings{definitions.Default}, "settings"},
+		at.FC{af.Settings{Definitions: definitions.Default}, "settings"},
 
 		// we create the appointments API
 		at.FC{af.AppointmentsServer{}, "appointmentsServer"},

servers/appointments_test.go

@@ -30,7 +30,7 @@ func TestAppointmentsApi(t *testing.T) {
 	var fixturesConfig = []at.FC{
 
 		// we create the settings
-		at.FC{af.Settings{definitions.Default}, "settings"},
+		at.FC{af.Settings{Definitions: definitions.Default}, "settings"},
 
 		// we create the appointments API
 		at.FC{af.AppointmentsServer{}, "appointmentsServer"},

settings.go

@@ -72,7 +72,7 @@ type MeterSettings struct {
 }
 
 type Settings struct {
-	Test         bool                  `json:"test"`
+	Test         *bool                 `json:"test,omitempty"`
 	Admin        *AdminSettings        `json:"admin,omitempty"`
 	Definitions  *Definitions          `json:"definitions,omitempty"`
 	Storage      *StorageSettings      `json:"storage,omitempty"`

testing/fixtures/settings.go

@@ -23,11 +23,15 @@ import (
 
 type Settings struct {
 	Definitions services.Definitions
+	LogLevel    services.Level
 }
 
 func (c Settings) Setup(fixtures map[string]interface{}) (interface{}, error) {
-	// we set the loglevel to 'debug' so we can see which settings files are being loaded
-	services.Log.SetLevel(services.DebugLogLevel)
+	if c.LogLevel == services.PanicLogLevel {
+		// panic log level is the default but we want debug as default
+		c.LogLevel = services.DebugLogLevel
+	}
+	services.Log.SetLevel(c.LogLevel)
 
 	paths := helpers.SettingsPaths()
 
@@ -37,9 +41,12 @@ func (c Settings) Setup(fixtures map[string]interface{}) (interface{}, error) {
 		return nil, err
 	} else if meter, err := helpers.InitializeMeter(settings); err != nil {
 		return nil, err
-	} else if err := db.Reset(); err != nil {
-		return nil, err
 	} else {
+		if db != nil {
+			if err := db.Reset(); err != nil {
+				return nil, err
+			}
+		}
 		settings.DatabaseObj = db
 		settings.MeterObj = meter
 		return settings, nil