projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't throw an error when the Butler says it is finished (#2097).
[dcpomatic.git]
/
test
/
config_test.cc
diff --git
a/test/config_test.cc
b/test/config_test.cc
index 173c95cbf9c4fe1cc778b221cead0b8b6f6a4798..035d778281936f9ddc3f4eb7de119d1b5819957b 100644
(file)
--- a/
test/config_test.cc
+++ b/
test/config_test.cc
@@
-124,12
+124,22
@@
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();
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 / "config.xml", "test/data/2.14.config.xml", {});
check_xml (dir / "cinemas.xml", "test/data/2.14.cinemas.xml", {});
+#ifdef DCPOMATIC_WINDOWS
+ /* This file has the windows path for dkdm_recipients.xml (with backslashes) */
+ check_xml (dir / "2.16" / "config.xml", "test/data/2.16.config.windows.xml", {});
+#else
check_xml (dir / "2.16" / "config.xml", "test/data/2.16.config.xml", {});
check_xml (dir / "2.16" / "config.xml", "test/data/2.16.config.xml", {});
+#endif
/* cinemas.xml is not copied into 2.16 as its format has not changed */
BOOST_REQUIRE (!boost::filesystem::exists(dir / "2.16" / "cinemas.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();
}
}