D-Bus testing: fix slowing down file sources

Recent shells filter out environment variables that are not valid shell
variables, so for example,
SYNCEVOLUTION_FILE_SOURCE_DELAY_OPEN_addressbook-slow-server did not get
passed through to syncevo-dbus-server because of the hyphen. As a result, the
tests became unreliable (non-deterministic timing) or outright failed.

Now we ensure that these variables are valid also in a shell and in addition,
make the test stricter such that it detects when the file backend did not
wait.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/backends/file/FileSyncSource.cpp b/src/backends/file/FileSyncSource.cpp
index 2c9514f9..995d27b6 100644
--- a/src/backends/file/FileSyncSource.cpp
+++ b/src/backends/file/FileSyncSource.cpp
@@ -104,6 +104,7 @@ void FileSyncSource::open()
     bool createDir = false;
 
     std::string varname = StringPrintf("SYNCEVOLUTION_FILE_SOURCE_DELAY_OPEN_%s", getDisplayName().c_str());
+    boost::replace_all(varname, "-", "_");
     const char *delay = getenv(varname.c_str());
     if (delay) {
         int seconds = atoi(delay);
@@ -187,6 +188,7 @@ void FileSyncSource::listAllItems(RevisionMap_t &revisions)
     ReadDir dirContent(m_basedir);
 
     std::string varname = StringPrintf("SYNCEVOLUTION_FILE_SOURCE_DELAY_LISTALL_%s", getDisplayName().c_str());
+    boost::replace_all(varname, "-", "_");
     const char *delay = getenv(varname.c_str());
     if (delay) {
         int seconds = atoi(delay);