From 89ea0b994649b36d66b40089fdfdad466cca7ab2 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 5 Jul 2015 14:16:17 +0200
Subject: [PATCH] simplify test setup: as long as all games have
 nmr.removenewbie set to off by their config, no test should need to disable
 it.

---
 scripts/tests/common.lua         | 2 --
 scripts/tests/e2/guard.lua       | 1 -
 scripts/tests/e2/movement.lua    | 1 -
 scripts/tests/e2/shiplanding.lua | 1 -
 scripts/tests/e3/spells.lua      | 1 -
 scripts/tests/movement.lua       | 1 -
 scripts/tests/orders.lua         | 1 -
 scripts/tests/pool.lua           | 1 -
 8 files changed, 9 deletions(-)

diff --git a/scripts/tests/common.lua b/scripts/tests/common.lua
index b4800761f..fb1a29965 100644
--- a/scripts/tests/common.lua
+++ b/scripts/tests/common.lua
@@ -26,7 +26,6 @@ module("tests.common", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("NewbieImmunity", "0")
     eressea.settings.set("rules.economy.food", "4")
@@ -961,7 +960,6 @@ module("tests.report", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("rules.economy.food", "4")
 end
diff --git a/scripts/tests/e2/guard.lua b/scripts/tests/e2/guard.lua
index 1afd011e9..b1c9d9c4f 100644
--- a/scripts/tests/e2/guard.lua
+++ b/scripts/tests/e2/guard.lua
@@ -4,7 +4,6 @@ module("tests.e2.guard", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("NewbieImmunity", "0")
     eressea.settings.set("rules.economy.food", "4")
diff --git a/scripts/tests/e2/movement.lua b/scripts/tests/e2/movement.lua
index ef62873d8..7e20e41ca 100644
--- a/scripts/tests/e2/movement.lua
+++ b/scripts/tests/e2/movement.lua
@@ -4,7 +4,6 @@ module("tests.e2.movement", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("NewbieImmunity", "0")
 end
diff --git a/scripts/tests/e2/shiplanding.lua b/scripts/tests/e2/shiplanding.lua
index 2d9225b8d..a46a7da37 100644
--- a/scripts/tests/e2/shiplanding.lua
+++ b/scripts/tests/e2/shiplanding.lua
@@ -4,7 +4,6 @@ module("tests.e2.shiplanding", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("NewbieImmunity", "0")
 end
diff --git a/scripts/tests/e3/spells.lua b/scripts/tests/e3/spells.lua
index 7afe96d8e..c4f0aadaf 100644
--- a/scripts/tests/e3/spells.lua
+++ b/scripts/tests/e3/spells.lua
@@ -5,7 +5,6 @@ module("tests.e3.spells", package.seeall, lunit.testcase)
 function setup()
     eressea.game.reset()
     eressea.settings.set("magic.fumble.enable", "0")
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("rules.peasants.growth", "0")
 end
diff --git a/scripts/tests/movement.lua b/scripts/tests/movement.lua
index e27831cc8..110b5b2a2 100644
--- a/scripts/tests/movement.lua
+++ b/scripts/tests/movement.lua
@@ -4,7 +4,6 @@ module("tests.movement", package.seeall, lunit.testcase)
 
 function setup()
     eressea.free_game()
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("rules.ships.storms", "0")
     conf = [[{
diff --git a/scripts/tests/orders.lua b/scripts/tests/orders.lua
index 98115f644..d9443c9c4 100644
--- a/scripts/tests/orders.lua
+++ b/scripts/tests/orders.lua
@@ -16,7 +16,6 @@ function setup()
     u = _G.unit.create(f, r, 1)
     u:clear_orders()
     eressea.settings.set("rules.economy.food", "4")
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("NewbieImmunity", "0")
 end
diff --git a/scripts/tests/pool.lua b/scripts/tests/pool.lua
index 3ee3d54db..bf32eda87 100644
--- a/scripts/tests/pool.lua
+++ b/scripts/tests/pool.lua
@@ -6,7 +6,6 @@ function setup()
     eressea.game.reset()
     eressea.config.reset()
     eressea.settings.set("rules.economy.food", "0")
-    eressea.settings.set("nmr.removenewbie", "0")
     eressea.settings.set("nmr.timeout", "0")
     eressea.settings.set("rules.magic.playerschools", "")
     conf = [[{