2006-06-09 23:23:42 +02:00
|
|
|
import avahi
|
2006-06-14 20:42:44 +02:00
|
|
|
from sugar import util
|
2006-06-18 07:31:18 +02:00
|
|
|
import dbus
|
2006-06-14 20:42:44 +02:00
|
|
|
|
2006-06-09 23:23:42 +02:00
|
|
|
def _txt_to_dict(txt):
|
|
|
|
"""Convert an avahi-returned TXT record formatted
|
|
|
|
as nested arrays of integers (from dbus) into a dict
|
|
|
|
of key/value string pairs."""
|
|
|
|
prop_dict = {}
|
|
|
|
props = avahi.txt_array_to_string_array(txt)
|
|
|
|
for item in props:
|
|
|
|
key = value = None
|
|
|
|
if '=' not in item:
|
|
|
|
# No = means a boolean value of true
|
|
|
|
key = item
|
|
|
|
value = True
|
|
|
|
else:
|
|
|
|
(key, value) = item.split('=')
|
|
|
|
prop_dict[key] = value
|
|
|
|
return prop_dict
|
|
|
|
|
2006-06-22 20:05:38 +02:00
|
|
|
def compose_service_name(name, activity_id):
|
|
|
|
if not activity_id:
|
|
|
|
return name
|
|
|
|
if type(name) == type(u""):
|
|
|
|
raise ValueError("name must not be in unicode.")
|
|
|
|
if not name or type(name) != type(""):
|
|
|
|
raise ValueError("name must be a valid string.")
|
|
|
|
composed = "%s [%s]" % (name, activity_id)
|
2006-06-16 21:27:50 +02:00
|
|
|
return composed.encode()
|
2006-06-15 23:05:44 +02:00
|
|
|
|
2006-06-22 20:05:38 +02:00
|
|
|
def _decompose_service_name(name):
|
|
|
|
"""Break a service name into the name and activity ID, if we can."""
|
|
|
|
if type(name) != type(""):
|
|
|
|
raise ValueError("name must be a valid string.")
|
|
|
|
name_len = len(name)
|
|
|
|
if name_len < util.ACTIVITY_ID_LEN + 5:
|
|
|
|
return (None, name)
|
|
|
|
# check for activity id end marker
|
|
|
|
if name[name_len - 1] != "]":
|
|
|
|
return (None, name)
|
|
|
|
start = name_len - 1 - util.ACTIVITY_ID_LEN
|
|
|
|
end = name_len - 1
|
|
|
|
# check for activity id start marker
|
|
|
|
if name[start - 1] != "[" or name[start - 2] != " ":
|
|
|
|
return (None, name)
|
|
|
|
activity_id = name[start:end]
|
|
|
|
if not util.validate_activity_id(activity_id):
|
|
|
|
return (None, name)
|
|
|
|
return (activity_id, name[:start - 2])
|
2006-06-14 20:42:44 +02:00
|
|
|
|
2006-06-13 21:25:54 +02:00
|
|
|
def is_multicast_address(address):
|
2006-06-13 00:31:26 +02:00
|
|
|
"""Simple numerical check for whether an IP4 address
|
|
|
|
is in the range for multicast addresses or not."""
|
|
|
|
if not address:
|
|
|
|
return False
|
|
|
|
if address[3] != '.':
|
|
|
|
return False
|
|
|
|
first = int(address[:3])
|
|
|
|
if first >= 224 and first <= 239:
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
2006-06-18 07:31:18 +02:00
|
|
|
def deserialize(sdict):
|
|
|
|
try:
|
|
|
|
name = sdict['name']
|
2006-06-19 15:47:04 +02:00
|
|
|
if type(name) == type(u""):
|
|
|
|
name = name.encode()
|
2006-06-22 20:05:38 +02:00
|
|
|
stype = sdict['stype']
|
|
|
|
if type(stype) == type(u""):
|
|
|
|
stype = stype.encode()
|
2006-06-18 07:31:18 +02:00
|
|
|
domain = sdict['domain']
|
2006-06-19 15:47:04 +02:00
|
|
|
if type(domain) == type(u""):
|
|
|
|
domain = domain.encode()
|
2006-06-18 07:31:18 +02:00
|
|
|
port = sdict['port']
|
|
|
|
properties = sdict['properties']
|
|
|
|
except KeyError, exc:
|
|
|
|
raise ValueError("Serialized service object was not valid.")
|
|
|
|
|
|
|
|
address = None
|
|
|
|
try:
|
|
|
|
address = sdict['address']
|
2006-06-19 15:47:04 +02:00
|
|
|
if type(address) == type(u""):
|
|
|
|
address = address.encode()
|
2006-06-18 07:31:18 +02:00
|
|
|
except KeyError:
|
|
|
|
pass
|
2006-06-23 00:07:54 +02:00
|
|
|
|
|
|
|
activity_id = None
|
|
|
|
try:
|
|
|
|
activity_id = sdict['activity_id']
|
|
|
|
if type(activity_id) == type(u""):
|
|
|
|
activity_id = activity_id.encode()
|
|
|
|
except KeyError:
|
|
|
|
pass
|
|
|
|
|
|
|
|
if activity_id is not None:
|
|
|
|
name = compose_service_name(name, activity_id)
|
|
|
|
|
2006-06-22 20:05:38 +02:00
|
|
|
return Service(name, stype, domain, address=address,
|
2006-06-18 07:31:18 +02:00
|
|
|
port=port, properties=properties)
|
|
|
|
|
2006-06-13 21:25:54 +02:00
|
|
|
|
2006-06-22 20:05:38 +02:00
|
|
|
_ACTIVITY_ID_TAG = "ActivityID"
|
2006-06-15 17:29:00 +02:00
|
|
|
|
2006-06-09 23:23:42 +02:00
|
|
|
class Service(object):
|
|
|
|
"""Encapsulates information about a specific ZeroConf/mDNS
|
|
|
|
service as advertised on the network."""
|
2006-06-14 20:42:44 +02:00
|
|
|
def __init__(self, name, stype, domain, address=None, port=-1, properties=None):
|
2006-06-09 23:23:42 +02:00
|
|
|
# Validate immutable options
|
2006-06-16 21:27:50 +02:00
|
|
|
if name and type(name) == type(u""):
|
|
|
|
raise ValueError("name must not be in unicode.")
|
|
|
|
if not name or type(name) != type("") or not len(name):
|
2006-06-09 23:23:42 +02:00
|
|
|
raise ValueError("must specify a valid service name.")
|
|
|
|
|
2006-06-22 20:05:38 +02:00
|
|
|
if stype and type(stype) == type(u""):
|
2006-06-16 21:27:50 +02:00
|
|
|
raise ValueError("service type must not be in unicode.")
|
2006-06-22 20:05:38 +02:00
|
|
|
if not stype or type(stype) != type("") or not len(stype):
|
2006-06-09 23:23:42 +02:00
|
|
|
raise ValueError("must specify a service type.")
|
|
|
|
if not stype.endswith("._tcp") and not stype.endswith("._udp"):
|
|
|
|
raise ValueError("must specify a TCP or UDP service type.")
|
|
|
|
|
2006-06-16 21:27:50 +02:00
|
|
|
if domain and type(domain) == type(u""):
|
|
|
|
raise ValueError("domain must not be in unicode.")
|
|
|
|
if type(domain) != type(""):
|
2006-06-09 23:23:42 +02:00
|
|
|
raise ValueError("must specify a domain.")
|
2006-06-16 21:27:50 +02:00
|
|
|
if len(domain) and domain != "local":
|
2006-06-09 23:23:42 +02:00
|
|
|
raise ValueError("must use the 'local' domain (for now).")
|
|
|
|
|
2006-06-22 20:05:38 +02:00
|
|
|
(actid, real_name) = _decompose_service_name(name)
|
|
|
|
self._name = real_name
|
|
|
|
self._stype = stype
|
2006-06-09 23:23:42 +02:00
|
|
|
self._domain = domain
|
|
|
|
self._port = -1
|
|
|
|
self.set_port(port)
|
|
|
|
self._properties = {}
|
|
|
|
self.set_properties(properties)
|
2006-06-20 03:14:51 +02:00
|
|
|
# Publisher address is the unicast source IP
|
2006-06-18 04:06:20 +02:00
|
|
|
self._publisher_address = address
|
2006-06-20 03:14:51 +02:00
|
|
|
# Address is the published address, could be multicast or unicast
|
2006-06-18 04:06:20 +02:00
|
|
|
self._address = None
|
|
|
|
if self._properties.has_key('address'):
|
|
|
|
self.set_address(self._properties['address'])
|
|
|
|
else:
|
|
|
|
self.set_address(address)
|
2006-06-15 17:29:00 +02:00
|
|
|
|
2006-06-22 20:05:38 +02:00
|
|
|
# Ensure that an ActivityID tag, if given, matches
|
2006-06-15 17:29:00 +02:00
|
|
|
# what we expect from the service type
|
2006-06-22 20:05:38 +02:00
|
|
|
if self._properties.has_key(_ACTIVITY_ID_TAG):
|
|
|
|
prop_actid = self._properties[_ACTIVITY_ID_TAG]
|
|
|
|
if (prop_actid and not actid) or (prop_actid != actid):
|
|
|
|
raise ValueError("ActivityID property specified, but the service names's activity ID didn't match it: %s, %s" % (prop_actid, actid))
|
|
|
|
self._activity_id = actid
|
|
|
|
if actid and not self._properties.has_key(_ACTIVITY_ID_TAG):
|
|
|
|
self._properties[_ACTIVITY_ID_TAG] = actid
|
2006-06-09 23:23:42 +02:00
|
|
|
|
2006-06-19 21:12:24 +02:00
|
|
|
def serialize(self, owner=None):
|
2006-06-18 07:31:18 +02:00
|
|
|
sdict = {}
|
2006-06-19 21:12:24 +02:00
|
|
|
if owner is not None:
|
|
|
|
sdict['name'] = dbus.Variant(owner.get_nick_name())
|
|
|
|
else:
|
|
|
|
sdict['name'] = dbus.Variant(self._name)
|
2006-06-22 20:05:38 +02:00
|
|
|
sdict['stype'] = dbus.Variant(self._stype)
|
2006-06-23 00:07:54 +02:00
|
|
|
if self._activity_id:
|
|
|
|
sdict['activity_id'] = dbus.Variant(self._activity_id)
|
2006-06-18 07:31:18 +02:00
|
|
|
sdict['domain'] = dbus.Variant(self._domain)
|
|
|
|
if self._address:
|
|
|
|
sdict['address'] = dbus.Variant(self._address)
|
|
|
|
sdict['port'] = dbus.Variant(self._port)
|
|
|
|
sdict['properties'] = dbus.Variant(self._properties)
|
|
|
|
return sdict
|
|
|
|
|
2006-06-09 23:23:42 +02:00
|
|
|
def get_name(self):
|
2006-06-13 00:31:26 +02:00
|
|
|
"""Return the service's name, usually that of the
|
|
|
|
buddy who provides it."""
|
2006-06-09 23:23:42 +02:00
|
|
|
return self._name
|
|
|
|
|
2006-06-13 00:31:26 +02:00
|
|
|
def is_multicast_service(self):
|
|
|
|
"""Return True if the service's address is a multicast address,
|
|
|
|
False if it is not."""
|
2006-06-13 21:25:54 +02:00
|
|
|
return is_multicast_address(self._address)
|
2006-06-13 00:31:26 +02:00
|
|
|
|
2006-06-09 23:23:42 +02:00
|
|
|
def get_one_property(self, key):
|
2006-06-13 00:31:26 +02:00
|
|
|
"""Return one property of the service, or None
|
|
|
|
if the property was not found. Cannot distinguish
|
|
|
|
between lack of a property, and a property value that
|
|
|
|
actually is None."""
|
2006-06-09 23:23:42 +02:00
|
|
|
if key in self._properties.keys():
|
|
|
|
return self._properties[key]
|
|
|
|
return None
|
|
|
|
|
|
|
|
def get_properties(self):
|
2006-06-13 00:31:26 +02:00
|
|
|
"""Return a python dictionary of all the service's
|
|
|
|
properties."""
|
2006-06-09 23:23:42 +02:00
|
|
|
return self._properties
|
|
|
|
|
|
|
|
def set_properties(self, properties):
|
2006-06-13 00:31:26 +02:00
|
|
|
"""Set the service's properties from either an Avahi
|
|
|
|
TXT record (a list of lists of integers), or a
|
|
|
|
python dictionary."""
|
2006-06-09 23:23:42 +02:00
|
|
|
self._properties = {}
|
2006-06-19 20:52:46 +02:00
|
|
|
props = {}
|
2006-06-09 23:23:42 +02:00
|
|
|
if type(properties) == type([]):
|
2006-06-19 20:52:46 +02:00
|
|
|
props = _txt_to_dict(properties)
|
2006-06-09 23:23:42 +02:00
|
|
|
elif type(properties) == type({}):
|
2006-06-19 20:52:46 +02:00
|
|
|
props = properties
|
|
|
|
|
|
|
|
# Set key/value pairs on internal property list,
|
|
|
|
# also convert everything to local encoding (for now)
|
|
|
|
# to ensure consistency
|
|
|
|
for key, value in props.items():
|
|
|
|
tmp_key = key
|
|
|
|
tmp_val = value
|
|
|
|
if type(tmp_key) == type(u""):
|
|
|
|
tmp_key = tmp_key.encode()
|
|
|
|
if type(tmp_val) == type(u""):
|
|
|
|
tmp_val = tmp_val.encode()
|
|
|
|
self._properties[tmp_key] = tmp_val
|
2006-06-09 23:23:42 +02:00
|
|
|
|
|
|
|
def get_type(self):
|
2006-06-22 20:05:38 +02:00
|
|
|
"""Return the service's service type."""
|
|
|
|
return self._stype
|
2006-06-16 21:27:50 +02:00
|
|
|
|
2006-06-22 20:05:38 +02:00
|
|
|
def get_activity_id(self):
|
|
|
|
"""Return the activity ID this service is associated with, if any."""
|
|
|
|
return self._activity_id
|
2006-06-09 23:23:42 +02:00
|
|
|
|
|
|
|
def get_port(self):
|
|
|
|
return self._port
|
|
|
|
|
|
|
|
def set_port(self, port):
|
2006-06-19 15:47:04 +02:00
|
|
|
if type(port) != type(1) or (port <= 1024 and port > 65536):
|
|
|
|
raise ValueError("must specify a valid port number between 1024 and 65536.")
|
2006-06-09 23:23:42 +02:00
|
|
|
self._port = port
|
|
|
|
|
2006-06-18 04:06:20 +02:00
|
|
|
def get_publisher_address(self):
|
|
|
|
return self._publisher_address
|
|
|
|
|
2006-06-09 23:23:42 +02:00
|
|
|
def get_address(self):
|
|
|
|
return self._address
|
|
|
|
|
|
|
|
def set_address(self, address):
|
|
|
|
if address is not None:
|
|
|
|
if type(address) != type("") and type(address) != type(u""):
|
|
|
|
raise ValueError("must specify a valid address.")
|
2006-06-15 23:05:44 +02:00
|
|
|
if address and type(address) == type(u""):
|
|
|
|
address = address.encode()
|
2006-06-09 23:23:42 +02:00
|
|
|
self._address = address
|
|
|
|
|
|
|
|
def get_domain(self):
|
2006-06-13 00:31:26 +02:00
|
|
|
"""Return the ZeroConf/mDNS domain the service was found in."""
|
2006-06-09 23:23:42 +02:00
|
|
|
return self._domain
|
|
|
|
|
|
|
|
|
|
|
|
#################################################################
|
|
|
|
# Tests
|
|
|
|
#################################################################
|
|
|
|
|
|
|
|
import unittest
|
|
|
|
|
|
|
|
class ServiceTestCase(unittest.TestCase):
|
|
|
|
_DEF_NAME = "foobar"
|
|
|
|
_DEF_STYPE = "_foo._bar._tcp"
|
|
|
|
_DEF_DOMAIN = "local"
|
|
|
|
_DEF_ADDRESS = "1.1.1.1"
|
|
|
|
_DEF_PORT = 1234
|
|
|
|
_DEF_PROPS = {'foobar': 'baz'}
|
|
|
|
|
|
|
|
_STR_TEST_ARGS = [None, 0, [], {}]
|
|
|
|
|
|
|
|
def _test_init_fail(self, name, stype, domain, address, port, properties, fail_msg):
|
|
|
|
"""Test something we expect to fail."""
|
|
|
|
try:
|
|
|
|
service = Service(name, stype, domain, address, port, properties)
|
|
|
|
except ValueError, exc:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("expected a ValueError for %s." % fail_msg)
|
|
|
|
|
|
|
|
def testName(self):
|
|
|
|
for item in self._STR_TEST_ARGS:
|
|
|
|
self._test_init_fail(item, self._DEF_STYPE, self._DEF_DOMAIN, self._DEF_ADDRESS,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS, "invalid name")
|
|
|
|
|
|
|
|
def testType(self):
|
|
|
|
for item in self._STR_TEST_ARGS:
|
|
|
|
self._test_init_fail(self._DEF_NAME, item, self._DEF_DOMAIN, self._DEF_ADDRESS,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS, "invalid service type")
|
|
|
|
self._test_init_fail(self._DEF_NAME, "_bork._foobar", self._DEF_DOMAIN, self._DEF_ADDRESS,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS, "invalid service type")
|
|
|
|
|
|
|
|
def testDomain(self):
|
|
|
|
for item in self._STR_TEST_ARGS:
|
|
|
|
self._test_init_fail(self._DEF_NAME, self._DEF_STYPE, item, self._DEF_ADDRESS,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS, "invalid domain")
|
|
|
|
# Only accept local for now
|
|
|
|
self._test_init_fail(self._DEF_NAME, self._DEF_STYPE, "foobar", self._DEF_ADDRESS,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS, "invalid domain")
|
2006-06-13 00:31:26 +02:00
|
|
|
# Make sure "" works
|
|
|
|
service = Service(self._DEF_NAME, self._DEF_STYPE, "", self._DEF_ADDRESS,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS)
|
|
|
|
assert service, "Empty domain was not accepted!"
|
2006-06-09 23:23:42 +02:00
|
|
|
|
|
|
|
def testAddress(self):
|
|
|
|
self._test_init_fail(self._DEF_NAME, self._DEF_STYPE, self._DEF_DOMAIN, [],
|
|
|
|
self._DEF_PORT, self._DEF_PROPS, "invalid address")
|
|
|
|
self._test_init_fail(self._DEF_NAME, self._DEF_STYPE, self._DEF_DOMAIN, {},
|
|
|
|
self._DEF_PORT, self._DEF_PROPS, "invalid address")
|
|
|
|
self._test_init_fail(self._DEF_NAME, self._DEF_STYPE, self._DEF_DOMAIN, 1234,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS, "invalid address")
|
|
|
|
|
|
|
|
def testPort(self):
|
|
|
|
self._test_init_fail(self._DEF_NAME, self._DEF_STYPE, self._DEF_DOMAIN, self._DEF_ADDRESS,
|
|
|
|
[], self._DEF_PROPS, "invalid port")
|
|
|
|
self._test_init_fail(self._DEF_NAME, self._DEF_STYPE, self._DEF_DOMAIN, self._DEF_ADDRESS,
|
|
|
|
{}, self._DEF_PROPS, "invalid port")
|
|
|
|
self._test_init_fail(self._DEF_NAME, self._DEF_STYPE, self._DEF_DOMAIN, self._DEF_ADDRESS,
|
|
|
|
"adf", self._DEF_PROPS, "invalid port")
|
|
|
|
|
|
|
|
def testGoodInit(self):
|
|
|
|
service = Service(self._DEF_NAME, self._DEF_STYPE, self._DEF_DOMAIN, self._DEF_ADDRESS,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS)
|
|
|
|
assert service.get_name() == self._DEF_NAME, "service name wasn't correct after init."
|
|
|
|
assert service.get_type() == self._DEF_STYPE, "service type wasn't correct after init."
|
|
|
|
assert service.get_domain() == "local", "service domain wasn't correct after init."
|
|
|
|
assert service.get_address() == self._DEF_ADDRESS, "service address wasn't correct after init."
|
|
|
|
assert service.get_port() == self._DEF_PORT, "service port wasn't correct after init."
|
|
|
|
value = service.get_one_property('foobar')
|
|
|
|
assert value and value == 'baz', "service property wasn't correct after init."
|
|
|
|
|
|
|
|
def testAvahiProperties(self):
|
|
|
|
props = [[111, 114, 103, 46, 102, 114, 101, 101, 100, 101, 115, 107, 116, 111, 112, 46, 65, 118, 97, 104, 105, 46, 99, 111, 111, 107, 105, 101, 61, 50, 54, 48, 49, 53, 52, 51, 57, 53, 50]]
|
|
|
|
key = "org.freedesktop.Avahi.cookie"
|
|
|
|
expected_value = "2601543952"
|
|
|
|
service = Service(self._DEF_NAME, self._DEF_STYPE, self._DEF_DOMAIN, self._DEF_ADDRESS,
|
|
|
|
self._DEF_PORT, props)
|
|
|
|
value = service.get_one_property(key)
|
|
|
|
assert value and value == expected_value, "service properties weren't correct after init."
|
|
|
|
value = service.get_one_property('bork')
|
|
|
|
assert not value, "service properties weren't correct after init."
|
|
|
|
|
|
|
|
def testBoolProperty(self):
|
|
|
|
props = [[111, 114, 103, 46, 102, 114, 101, 101, 100, 101, 115, 107, 116, 111, 112, 46, 65, 118, 97, 104, 105, 46, 99, 111, 111, 107, 105, 101]]
|
|
|
|
key = "org.freedesktop.Avahi.cookie"
|
|
|
|
expected_value = True
|
|
|
|
service = Service(self._DEF_NAME, self._DEF_STYPE, self._DEF_DOMAIN, self._DEF_ADDRESS,
|
|
|
|
self._DEF_PORT, props)
|
|
|
|
value = service.get_one_property(key)
|
|
|
|
assert value is not None and value == expected_value, "service properties weren't correct after init."
|
|
|
|
|
2006-06-13 00:31:26 +02:00
|
|
|
def testGroupService(self):
|
|
|
|
# Valid group service type, non-multicast address
|
|
|
|
group_stype = "_af5e5a7c998e89b9a_group_olpc._udp"
|
|
|
|
self._test_init_fail(self._DEF_NAME, group_stype, self._DEF_DOMAIN, self._DEF_ADDRESS,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS, "group service type, but non-multicast address")
|
|
|
|
|
|
|
|
# Valid group service type, None address
|
|
|
|
service = Service(self._DEF_NAME, group_stype, self._DEF_DOMAIN, None,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS)
|
|
|
|
assert service.get_address() == None, "address was not None as expected!"
|
|
|
|
# Set address to invalid multicast address
|
|
|
|
try:
|
|
|
|
service.set_address(self._DEF_ADDRESS)
|
|
|
|
except ValueError, exc:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("expected a ValueError for invalid address.")
|
|
|
|
|
|
|
|
# Valid group service type and multicast address, ensure it works
|
|
|
|
mc_addr = "224.0.0.34"
|
|
|
|
service = Service(self._DEF_NAME, group_stype, self._DEF_DOMAIN, mc_addr,
|
|
|
|
self._DEF_PORT, self._DEF_PROPS)
|
|
|
|
assert service.get_address() == mc_addr, "address was not expected address!"
|
|
|
|
|
2006-06-09 23:23:42 +02:00
|
|
|
def addToSuite(suite):
|
|
|
|
suite.addTest(ServiceTestCase("testName"))
|
|
|
|
suite.addTest(ServiceTestCase("testType"))
|
|
|
|
suite.addTest(ServiceTestCase("testDomain"))
|
|
|
|
suite.addTest(ServiceTestCase("testAddress"))
|
|
|
|
suite.addTest(ServiceTestCase("testPort"))
|
|
|
|
suite.addTest(ServiceTestCase("testGoodInit"))
|
|
|
|
suite.addTest(ServiceTestCase("testAvahiProperties"))
|
|
|
|
suite.addTest(ServiceTestCase("testBoolProperty"))
|
2006-06-13 00:31:26 +02:00
|
|
|
suite.addTest(ServiceTestCase("testGroupService"))
|
2006-06-09 23:23:42 +02:00
|
|
|
addToSuite = staticmethod(addToSuite)
|
|
|
|
|
|
|
|
|
|
|
|
def main():
|
|
|
|
suite = unittest.TestSuite()
|
|
|
|
ServiceTestCase.addToSuite(suite)
|
|
|
|
runner = unittest.TextTestRunner()
|
|
|
|
runner.run(suite)
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
main()
|