test-dbus: Update term 'type' to be its non-ambiguous version

This commit is contained in:
Chris Kühl 2011-06-27 13:57:41 +02:00 committed by Patrick Ohly
parent 7418c69bd3
commit 650e3c8e59
1 changed files with 5 additions and 5 deletions

View File

@ -1620,7 +1620,7 @@ class TestSessionAPIsDummy(unittest.TestCase, DBusUtil):
else:
self.fail("no exception thrown")
def testCheckSourceInvalidType(self):
def testCheckSourceInvalidBackend(self):
"""TestSessionAPIsDummy.testCheckSourceInvalidType - test the right error is reported when the type is invalid """
self.setupConfig()
config = { "source/memo" : { "backend" : "no-such-backend"} }
@ -1632,7 +1632,7 @@ class TestSessionAPIsDummy(unittest.TestCase, DBusUtil):
else:
self.fail("no exception thrown")
def testCheckSourceNoType(self):
def testCheckSourceNoBackend(self):
"""TestSessionAPIsDummy.testCheckSourceNoType - test the right error is reported when the source is unusable"""
self.setupConfig()
config = { "source/memo" : { "backend" : "file",
@ -2723,7 +2723,7 @@ class TestMultipleConfigs(unittest.TestCase, DBusUtil):
self.assertEqual(config[""]["deviceId"], "shared-device-identifier")
self.assertEqual(config["source/addressbook"]["database"], "Work")
def testSharedType(self):
def testSharedProperties(self):
"""TestMultipleConfigs.testSharedType - 'type' consists of per-peer and shared properties"""
self.setupConfigs()
@ -2743,7 +2743,7 @@ class TestMultipleConfigs(unittest.TestCase, DBusUtil):
self.assertEqual(config["source/addressbook"]["databaseFormat"], "text/x-vcard")
self.session.Detach()
def testSharedTypeOther(self):
def testSharedPropertyOther(self):
"""TestMultipleConfigs.testSharedTypeOther - shared backend properties must be preserved when adding peers"""
# writing peer modifies properties in "foo" and creates context "@other"
self.setUpSession("Foo@other")
@ -2759,7 +2759,7 @@ class TestMultipleConfigs(unittest.TestCase, DBusUtil):
self.assertEqual(config["source/addressbook"]["databaseFormat"], "text/x-vcard")
self.session.Detach()
# adding second client must preserve type
# adding second client must preserve property
self.setUpSession("bar@other")
config = self.server.GetConfig("Funambol@other", True, utf8_strings=True)
self.assertEqual(config["source/addressbook"]["backend"], "file")