test: Improve tethering scripts

2 files changed, 18 insertions, 9 deletions

diff --git a/test/disable-tethering b/test/disable-tethering
index 2dabd839..e275b2b6 100755
--- a/test/disable-tethering
+++ b/test/disable-tethering
@@ -6,8 +6,6 @@ import dbus
 if (len(sys.argv) < 2):
 	print "Usage: %s type" % (sys.argv[0])
 
-print "Disabling %s tethering" % (sys.argv[1])
-
 bus = dbus.SystemBus()
 
 manager = dbus.Interface(bus.get_object('net.connman', "/"),
@@ -22,11 +20,17 @@ def technology_disable_tethering(path, tech_type):
 	for key in properties.keys():
 		if key in ["Type"]:
 			if properties[key] == tech_type:
+				print "Disabling %s tethering" % tech_type
 				tech.SetProperty("Tethering", dbus.Boolean(0))
 
+				return tech_type
+
 properties = manager.GetProperties()
 
 for key in properties.keys():
 	if key in ["Technologies"]:
 		for path in properties[key]:
-			technology_disable_tethering(path, sys.argv[1])
+			tech = technology_disable_tethering(path, sys.argv[1])
+
+if tech == None:
+	print "Failed to disable %s tethering" % (sys.argv[1])
diff --git a/test/enable-tethering b/test/enable-tethering
index 4464b26b..6bb1a9ae 100755
--- a/test/enable-tethering
+++ b/test/enable-tethering
@@ -9,8 +9,6 @@ if (len(sys.argv) < 4 and sys.argv[1] == "wifi"):
 elif (len(sys.argv) < 2):
 	print "Usage: %s type" % (sys.argv[0])
 
-print "Enabling %s tethering" % (sys.argv[1])
-
 bus = dbus.SystemBus()
 
 manager = dbus.Interface(bus.get_object('net.connman', "/"),
@@ -31,16 +29,23 @@ def technology_enable_tethering(path, tech_type, ssid, psk):
 				if len(psk) > 0:
 					tech.SetProperty("TetheringPassphrase",
 								psk)
+				print "Enabling %s tethering" % tech_type
 				tech.SetProperty("Tethering", dbus.Boolean(1))
 
+				return tech_type
+
 properties = manager.GetProperties()
 
 for key in properties.keys():
 	if key in ["Technologies"]:
 		for path in properties[key]:
 			if (len(sys.argv) == 4):
-				technology_enable_tethering(path, sys.argv[1],
-						sys.argv[2], sys.argv[3])
+				tech = technology_enable_tethering(path,
+					sys.argv[1], sys.argv[2], sys.argv[3])
 			else:
-				technology_enable_tethering(path, sys.argv[1],
-									"", "")
+				tech = technology_enable_tethering(path,
+							sys.argv[1], "", "")
+
+
+if tech == None:
+	print "Failed to enable %s tethering" % (sys.argv[1])