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

DBus server: use temporary configs for GetConfig(MB#8116)

Browse source 
In Session.GetConfig, when checking whether a given config exists,
configs set temporarily should be concerned. Otherwise, the given
config will be treated as a non-existing one though it has been
set temporarily.
Previous implementation only applies temporary configs when the config
exists on disk. This is not expected.

Also write a test case(testGetConfigWithTempConfig) for this scenario:
first set up a config with temporary configs, and then call GetConfig
to get configs from it. This will be failed in the previous version and
successful now.
This commit is contained in:
Zhu, Yongsheng 2009-12-25 16:17:58 +08:00
parent 8006946129
commit c09e17d90c
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/syncevo-dbus-server.cpp
View file

@ -215,8 +215,10 @@ private:
/**
* This virtual function is used to let subclass set
* filters to config. Only used internally.
* Return true if filters exists and have been set.
* Otherwise, nothing is set to config
*/
virtual void setFilters(SyncConfig &config) {}
virtual bool setFilters(SyncConfig &config) { return false; }
/** utility method which constructs a SyncConfig which references a local configuration (never a template) */
boost::shared_ptr<SyncConfig> getLocalConfig(const std::string &configName);
@ -1096,7 +1098,7 @@ public:
private:
/** set m_syncFilter and m_sourceFilters to config */
virtual void setFilters(SyncConfig &config);
virtual bool setFilters(SyncConfig &config);
};
@ -1400,18 +1402,16 @@ boost::shared_ptr<SyncConfig> ReadOperations::getLocalConfig(const string &confi
peer, context);
boost::shared_ptr<SyncConfig> syncConfig(new SyncConfig(configName));
// the default configuration can always be opened for reading,
// everything else must exist
if ((context != "default" || peer != "") &&
!syncConfig->exists()) {
SE_THROW_EXCEPTION(NoSuchConfig, "No configuration '" + configName + "' found");
/** if config was not set temporarily */
if (!setFilters(*syncConfig)) {
// the default configuration can always be opened for reading,
// everything else must exist
if ((context != "default" || peer != "") &&
!syncConfig->exists()) {
SE_THROW_EXCEPTION(NoSuchConfig, "No configuration '" + configName + "' found");
}
}
// TODO: handle temporary configs (MB #8116)
// - if config was set temporarily, it doesn't have to exist on disk =>
// the check above is too strict
// - set temporary properties as filters
return syncConfig;
}
@ -1447,7 +1447,6 @@ void ReadOperations::getConfig(bool getTemplate,
} else {
syncConfig = getLocalConfig(m_configName);
}
setFilters(*syncConfig);
/** get sync properties and their values */
ConfigPropertyRegistry &syncRegistry = SyncConfig::getRegistry();
@ -2248,7 +2247,7 @@ void Session::run()
}
}
void Session::setFilters(SyncConfig &config)
bool Session::setFilters(SyncConfig &config)
{
/** apply temporary configs to config */
config.setConfigFilter(true, "", m_syncFilter);
@ -2256,6 +2255,7 @@ void Session::setFilters(SyncConfig &config)
BOOST_FOREACH(const SourceFilters_t::value_type &value, m_sourceFilters) {
config.setConfigFilter(false, value.first, value.second);
}
return m_tempConfig;
}
void Session::setStepInfo(bool isWaiting)

12
test/test-dbus.py
View file

@ -698,8 +698,8 @@ class TestSessionAPIsDummy(unittest.TestCase, DBusUtil):
"username" : "unknown",
"password" : "-",
"deviceId" : "foo",
"retryInterval" : "1",
"retryDuration" : "1"
"RetryInterval" : "1",
"RetryDuration" : "1"
},
"source/addressbook" : { "sync" : "two-way",
"type" : "addressbook",
@ -788,6 +788,14 @@ class TestSessionAPIsDummy(unittest.TestCase, DBusUtil):
self.failUnlessEqual(config[""]["password"], "nosecret")
self.failUnlessEqual(config["source/addressbook"]["sync"], "slow")
def testGetConfigWithTempConfig(self):
""" test the config is gotten for a new temporary config. """
""" The given config doesn't exist on disk and it's set temporarily. Then GetConfig should
return the configs temporarily set. """
self.session.SetConfig(True, True, self.config, utf8_strings=True)
config = self.session.GetConfig(False, utf8_strings=True)
self.failUnlessEqual(config, self.config)
def testUpdateConfigError(self):
""" test the right error is reported when an invalid property value is set """
self.setupConfig()