Thinking I've finally fixed the unit tests

rhinoman · Mar 13, 2016 · cf7f7a6 · cf7f7a6
1 parent 452ecbc
commit cf7f7a6
Show file tree

Hide file tree

Showing 8 changed files with 455 additions and 468 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,6 +61,7 @@ crashlytics-build.properties
 
 #Other project specific stuff
 dev1_start.sh
+torture_test.sh
 config.ini
 frontend/index.html
 frontend/plugins/plugins.ini

diff --git a/common/config/config.go b/common/config/config.go
@@ -125,7 +125,7 @@ func LoadDefaults() {
 	Database.UseSSL = false
 	Database.DbAdminUser = "adminuser"
 	Database.DbAdminPassword = "password"
-	Database.DbTimeout = "500"
+	Database.DbTimeout = "0"
 	Database.MainDb = "main_ut"
 	Logger.LogFile = "wikifeat-service.log"
 	Logger.MaxSize = 10

diff --git a/config/config_loader/config_loader_test.go b/config/config_loader/config_loader_test.go
@@ -54,8 +54,6 @@ func TestConfigLoader(t *testing.T) {
 	config_loader.SetConfig()
 	//Reset the local config to defaults
 	config.LoadDefaults()
-	//Load config from etcd
-	config.FetchConfig()
 	//Check the config items we set
 	if config.Notifications.FromEmail != "turd.furgeson@nowhere.com" {
 		t.Errorf("Notifications.FromEmail not set: %v", config.Notifications.FromEmail)