Fix tests.v2.15.163

2 files changed, 6 insertions, 1 deletions

diff --git a/test/config_test.cc b/test/config_test.cc
index 173c95cbf..2fd6fe4aa 100644
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -124,12 +124,17 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test)
 	boost::filesystem::copy_file ("test/data/2.14.config.xml", dir / "config.xml");
 	boost::filesystem::copy_file ("test/data/2.14.cinemas.xml", dir / "cinemas.xml");
 	Config::instance();
-	Config::instance()->write();
+	try {
+		/* This will fail to write cinemas.xml since the link is to a non-existant directory */
+		Config::instance()->write();
+	} catch (...) {}
 
 	check_xml (dir / "config.xml", "test/data/2.14.config.xml", {});
 	check_xml (dir / "cinemas.xml", "test/data/2.14.cinemas.xml", {});
 	check_xml (dir / "2.16" / "config.xml", "test/data/2.16.config.xml", {});
 	/* cinemas.xml is not copied into 2.16 as its format has not changed */
 	BOOST_REQUIRE (!boost::filesystem::exists(dir / "2.16" / "cinemas.xml"));
+
+	setup_test_config();
 }
 
diff --git a/test/data b/test/data
-Subproject 56b37afdf96ecc83752ce70af061ee6c7ed4f78
+Subproject 246bb9adf94bc72bfe52394eacc88d6419605ac