maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

command line: fix for --create/remove-database 

Renaming "listing" to "acessing" broke testPrintDatabases (because
it needs to suppress that error for KDE, which is not running
during D-Bus testing) and introduced a typo.
This commit is contained in:
Patrick Ohly 2012-10-25 00:43:04 -07:00
parent 5f24f0ed53
commit 6d91e26980
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/syncevo/Cmdline.cpp
View File

@ -795,7 +795,7 @@ bool Cmdline::run() {
auto_ptr<SyncSource> source(SyncSource::createSource(params, false));
(this->*operation)(source.get(), header);
} catch (...) {
SE_LOG_ERROR(NULL, NULL, "%s:\nacessing databases failed", header.c_str());
SE_LOG_ERROR(NULL, NULL, "%s:\naccessing databases failed", header.c_str());
Exception::handle();
}
}

2
test/test-dbus.py
View File

@ -6947,7 +6947,7 @@ sources/calendar/config.ini:# databasePassword =
# full output
out, err, code = self.runCmdline(["--print-databases"])
# ignore errors about Akonadi not running
err = re.sub(r'''\[ERROR\] KDE.*\n\[ERROR\] listing databases failed\n\[ERROR\] Akonadi is not running. It can be started with 'akonadictl start'\.\n''', "", err)
err = re.sub(r'''\[ERROR\] KDE.*\n\[ERROR\] (listing|accessing) databases failed\n\[ERROR\] Akonadi is not running. It can be started with 'akonadictl start'\.\n''', "", err)
self.assertNoErrors(err)
# exact output varies, do not test