Fix tests being broken by new config test.v2.15.132

2 files changed, 5 insertions, 0 deletions

diff --git a/test/config_test.cc b/test/config_test.cc
index 4ca3ba07f..0c5c86a4a 100644
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -102,5 +102,10 @@ BOOST_AUTO_TEST_CASE (config_write_utf8_test)
 	Config::instance()->write();
 
 	check_file ("test/data/utf8_config.xml", "build/test/config.xml");
+
+	/* This test has called Config::set_defaults(), so take us back
+	   to the config that we want for our tests.
+	*/
+	setup_test_config ();
 }
 
diff --git a/test/data b/test/data
-Subproject 46d987847693c97a353b1bfc609efbd27e4c9f0
+Subproject 94ae4fe106b65c930b7dfbeb41cd5b8f8c83f69