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

testing: fixed testMigrate 

Deleted C++ version, fixed D-Bus version: must ignore errors
about Akonadi not running. Those happen if (and only if) Akonadi
support is enabled and Akonadi wasn't started manually before
running test-dbus.py.
This commit is contained in:
Patrick Ohly 2012-05-30 09:07:27 +02:00
parent 9847fceabe
commit bef4046cc6
2 changed files with 2 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/syncevo/Cmdline.cpp
View File

@ -2458,7 +2458,6 @@ class CmdlineTest : public CppUnit::TestFixture {
CPPUNIT_TEST(testConfigureTemplates);
CPPUNIT_TEST(testConfigureSources);
CPPUNIT_TEST(testOldConfigure);
CPPUNIT_TEST(testPrintDatabases);
CPPUNIT_TEST(testMigrate);
CPPUNIT_TEST(testMigrateContext);
CPPUNIT_TEST(testMigrateAutoSync);
@ -4265,65 +4264,6 @@ protected:
return expected;
}
void testPrintDatabases() {
{
// full output
TestCmdline cmdline("--print-databases", (char *)0);
cmdline.doit();
CPPUNIT_ASSERT_EQUAL_DIFF("", cmdline.m_err.str());
// exact output varies, do not test
}
bool haveEDS;
{
// limit output to one specific backend
TestCmdline cmdline("--print-databases", "backend=evolution-contacts", (char *)0);
cmdline.doit();
if (cmdline.m_err.str().find("not one of the valid values") != std::string::npos) {
// not enabled, only this error messages expected
CPPUNIT_ASSERT_EQUAL_DIFF("", cmdline.m_out.str());
} else {
// enabled, no error, one entry
haveEDS = true;
CPPUNIT_ASSERT_EQUAL_DIFF("", cmdline.m_err.str());
CPPUNIT_ASSERT(boost::starts_with(cmdline.m_out.str(), "evolution-contacts:\n"));
int entries = 0;
std::string out = cmdline.m_out.str();
BOOST_FOREACH(const std::string &line,
boost::tokenizer< boost::char_separator<char> >(out,
boost::char_separator<char>("\n"))) {
if (!boost::starts_with(line, " ")) {
entries++;
}
}
CPPUNIT_ASSERT_EQUAL(1, entries);
}
}
if (haveEDS) {
// limit output to one specific backend, chosen via config
{
TestCmdline cmdline("--configure", "backend=evolution-contacts", "@foo-config", "bar-source", (char *)0);
cmdline.doit();
CPPUNIT_ASSERT_EQUAL_DIFF("", cmdline.m_out.str());
}
{
TestCmdline cmdline("--print-databases", "@foo-config", "bar-source", (char *)0);
cmdline.doit();
CPPUNIT_ASSERT_EQUAL_DIFF("", cmdline.m_err.str());
CPPUNIT_ASSERT(boost::starts_with(cmdline.m_out.str(), "@foo-config/bar-source:\n"));
int entries = 0;
std::string out = cmdline.m_out.str();
BOOST_FOREACH(const std::string &line,
boost::tokenizer< boost::char_separator<char> >(out,
boost::char_separator<char>("\n"))) {
if (!boost::starts_with(line, " ")) {
entries++;
}
}
CPPUNIT_ASSERT_EQUAL(1, entries);
}
}
}
void testMigrate() {
ScopedEnvChange templates("SYNCEVOLUTION_TEMPLATE_DIR", "templates");
ScopedEnvChange xdg("XDG_CONFIG_HOME", m_testDir);

2
test/test-dbus.py
View File

@ -5930,6 +5930,8 @@ sources/calendar/config.ini:# databasePassword =
'''TestCmdline.testPrintDatabases - print some databases'''
# 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)
self.assertNoErrors(err)
# exact output varies, do not test