From e5379d85aab8bd6cd6d675048797b7134be28dc9 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Fri, 4 Feb 2011 20:18:23 +0100 Subject: service: Remove WPS from the exported D-Bus properties When WPS is supported it is added to the security string array. --- test/get-services | 5 +++-- test/list-services | 5 +++-- test/monitor-services | 3 ++- test/test-manager | 5 +++-- 4 files changed, 11 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/get-services b/test/get-services index 605e2780..47630a6b 100755 --- a/test/get-services +++ b/test/get-services @@ -40,10 +40,11 @@ for entry in services: "Ethernet", "Provider"]: val = extract_values(properties[key]) elif key in ["Nameservers", "Nameservers.Configuration", - "Domains", "Domains.Configuration"]: + "Domains", "Domains.Configuration", + "Security"]: val = extract_list(properties[key]) elif key in ["Favorite", "Immutable", "AutoConnect", - "SetupRequired", "PassphraseRequired", "WPS"]: + "SetupRequired", "PassphraseRequired"]: if properties[key] == dbus.Boolean(1): val = "true" else: diff --git a/test/list-services b/test/list-services index f1b89b6f..3ae6a4db 100755 --- a/test/list-services +++ b/test/list-services @@ -45,11 +45,12 @@ for path in properties["Services"]: "Ethernet", "Provider"]: val = extract_values(properties[key]) elif key in ["Nameservers", "Nameservers.Configuration", - "Domains", "Domains.Configuration"]: + "Domains", "Domains.Configuration", + "Security"]: val = extract_list(properties[key]) elif key in ["Favorite", "Immutable", "AutoConnect", "LoginRequired", "SetupRequired", - "PassphraseRequired", "WPS"]: + "PassphraseRequired"]: if properties[key] == dbus.Boolean(1): val = "true" else: diff --git a/test/monitor-services b/test/monitor-services index e4fe3284..cbae3772 100755 --- a/test/monitor-services +++ b/test/monitor-services @@ -35,7 +35,8 @@ def property_changed(name, value, path): "Proxy", "Proxy.Configuration", "Ethernet"]: val = extract_values(value) elif name in ["Nameservers", "Nameservers.Configuration", - "Domains", "Domains.Configuration"]: + "Domains", "Domains.Configuration" + "Security"]: val = extract_list(value) elif name in ["Strength", "Priority"]: val = int(value) diff --git a/test/test-manager b/test/test-manager index 87b0e165..a29eaf75 100755 --- a/test/test-manager +++ b/test/test-manager @@ -56,7 +56,7 @@ def print_properties(key, value): "Available", "Remember", "Default", "Favorite", "Immutable", "AutoConnect", "LoginRequired", "SetupRequired", - "PassphraseRequired", "WPS"]: + "PassphraseRequired"]: if properties[key] == dbus.Boolean(1): val = "true" else: @@ -69,7 +69,8 @@ def print_properties(key, value): val = extract_values(properties[key]) elif key in ["Nameservers", "Nameservers.Configuration", - "Domains", "Domains.Configuration"]: + "Domains", "Domains.Configuration", + "Security"]: val = extract_list(properties[key]) elif key in ["Strength", "Priority"]: -- cgit v1.2.3