diff options
| author | George Kiagiadakis <gkiagia@tolabaki.gr> | 2017-01-28 13:43:05 +0200 |
|---|---|---|
| committer | George Kiagiadakis <gkiagia@tolabaki.gr> | 2017-01-28 13:43:05 +0200 |
| commit | cce7b6a3d2f6ca95e937a16983bb7d6487641be7 (patch) | |
| tree | a28581ced33d4d43cc265e193cb7ba5c60f5e792 /tests/twisted | |
| parent | 190de711459a51eb236b773a57b0c188ebf1da6a (diff) | |
| parent | 19f10ec2a59cadd4c59d6bc3147c612007c1c615 (diff) | |
Merge branch 'telepathy-mission-control-5.16'
Diffstat (limited to 'tests/twisted')
| -rw-r--r-- | tests/twisted/fake-network-monitor.c | 16 | ||||
| -rw-r--r-- | tests/twisted/fakeconnectivity.py | 22 |
2 files changed, 36 insertions, 2 deletions
diff --git a/tests/twisted/fake-network-monitor.c b/tests/twisted/fake-network-monitor.c index b78d421c..f8b43cda 100644 --- a/tests/twisted/fake-network-monitor.c +++ b/tests/twisted/fake-network-monitor.c @@ -44,7 +44,9 @@ static GType fake_network_monitor_get_type (void); enum { PROP_0, - PROP_NETWORK_AVAILABLE + PROP_NETWORK_AVAILABLE, + PROP_NETWORK_METERED, + PROP_CONNECTIVITY }; static void initable_iface_init (GInitableIface *); @@ -80,7 +82,13 @@ fake_network_monitor_get_property (GObject *object, case PROP_NETWORK_AVAILABLE: g_value_set_boolean (value, self->available); break; - + case PROP_NETWORK_METERED: + g_value_set_boolean (value, FALSE); + break; + case PROP_CONNECTIVITY: + g_value_set_enum (value, self->available ? + G_NETWORK_CONNECTIVITY_FULL : G_NETWORK_CONNECTIVITY_LOCAL); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); break; @@ -111,6 +119,10 @@ fake_network_monitor_class_init (FakeNetworkMonitorClass *cls) g_object_class_override_property (oclass, PROP_NETWORK_AVAILABLE, "network-available"); + g_object_class_override_property (oclass, PROP_NETWORK_METERED, + "network-metered"); + g_object_class_override_property (oclass, PROP_CONNECTIVITY, + "connectivity"); } static void diff --git a/tests/twisted/fakeconnectivity.py b/tests/twisted/fakeconnectivity.py index 02d577fb..846dd767 100644 --- a/tests/twisted/fakeconnectivity.py +++ b/tests/twisted/fakeconnectivity.py @@ -6,7 +6,9 @@ import sys class FakeConnectivity(object): NM_BUS_NAME = 'org.freedesktop.NetworkManager' NM_PATH = '/org/freedesktop/NetworkManager' + NM_PATH_SETTINGS = NM_PATH + '/Settings' NM_INTERFACE = NM_BUS_NAME + NM_INTERFACE_SETTINGS = NM_INTERFACE + '.Settings' NM_STATE_UNKNOWN = 0 NM_STATE_ASLEEP = 10 @@ -47,6 +49,13 @@ class FakeConnectivity(object): q.add_dbus_method_impl(self.NM_GetDevices, path=self.NM_PATH, interface=self.NM_INTERFACE, method='GetDevices') + q.add_dbus_method_impl(self.NM_Settings_Get, + path=self.NM_PATH_SETTINGS, interface=dbus.PROPERTIES_IFACE, method='Get', + predicate=lambda e: e.args[0] == self.NM_INTERFACE_SETTINGS) + q.add_dbus_method_impl(self.NM_Settings_GetAll, + path=self.NM_PATH_SETTINGS, interface=dbus.PROPERTIES_IFACE, method='GetAll', + predicate=lambda e: e.args[0] == self.NM_INTERFACE_SETTINGS) + q.add_dbus_method_impl(self.ConnMan_GetProperties, path=self.CONNMAN_PATH, interface=self.CONNMAN_INTERFACE, method='GetProperties') @@ -92,6 +101,19 @@ class FakeConnectivity(object): def NM_GetDevices(self, e): self.q.dbus_return(e.message, [], signature='ao') + def nm_settings_props(self): + return { + 'CanModify': False, + 'Hostname': 'localhost', + 'Connections': dbus.Array([], signature='o'), + } + + def NM_Settings_Get(self, e): + self.q.dbus_return(e.message, self.nm_settings_props()[e.args[1]], signature='v') + + def NM_Settings_GetAll(self, e): + self.q.dbus_return(e.message, self.nm_settings_props(), signature='a{sv}') + def Connman_props(self): return { 'OfflineMode': False, |