X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fconfig_test.cc;h=e905500852428e9e8a56afb202342101457b3a22;hb=0f9f004c50a8bea6b87d5a1636f95f67066e5187;hp=6b35c595d0b60792b849056f7b66597ae1592c51;hpb=624f94b5e1ebb9efaaff81d4d734ae3600601a79;p=dcpomatic.git

diff --git a/test/config_test.cc b/test/config_test.cc
index 6b35c595d..e90550085 100644
--- a/test/config_test.cc
+++ b/test/config_test.cc
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE (config_upgrade_test)
 	boost::filesystem::copy_file ("test/data/2.14.cinemas.xml", dir / "cinemas.xml");
 	Config::instance();
 	try {
-		/* This will fail to write cinemas.xml since the link is to a non-existant directory */
+		/* This will fail to write cinemas.xml since the link is to a non-existent directory */
 		Config::instance()->write();
 	} catch (...) {}
 
@@ -215,6 +215,37 @@ BOOST_AUTO_TEST_CASE (config_keep_cinemas_if_making_new_config)
 	boost::filesystem::remove (dir / "2.16" / "config.xml");
 	Config::instance();
 
-	check_text_file (dir / "backup_for_test.xml", dir / "cinemas.xml.1");
+	check_text_file(dir / "backup_for_test.xml", dir / "cinemas.xml");
+}
+
+
+BOOST_AUTO_TEST_CASE(keep_config_if_cinemas_fail_to_load)
+{
+	ConfigRestorer cr;
+
+	/* Make a new config */
+	boost::filesystem::path dir = "build/test/keep_config_if_cinemas_fail_to_load";
+	Config::override_path = dir;
+	Config::drop();
+	boost::filesystem::remove_all(dir);
+	boost::filesystem::create_directories(dir);
+	Config::instance()->write();
+
+	auto const cinemas = dir / "cinemas.xml";
+
+	/* Back things up */
+	boost::filesystem::copy_file(dir / "2.16" / "config.xml", dir / "config_backup_for_test.xml");
+	boost::filesystem::copy_file(cinemas, dir / "cinemas_backup_for_test.xml");
+
+	/* Corrupt the cinemas */
+	Config::drop();
+	std::ofstream corrupt(cinemas.string().c_str());
+	corrupt << "foo\n";
+	corrupt.close();
+	Config::instance();
+
+	/* We should have a new cinemas.xml and the old config.xml */
+	check_text_file(dir / "2.16" / "config.xml", dir / "config_backup_for_test.xml");
+	check_text_file(cinemas, dir / "cinemas_backup_for_test.xml");
 }