Allow address parameter for device removal

1 files changed, 7 insertions, 3 deletions

diff --git a/src/test-device b/src/test-device
index 05a23d37..f8f2d14a 100755
--- a/src/test-device
+++ b/src/test-device
@@ -16,7 +16,7 @@ if (len(sys.argv) < 2):
 	print ""
 	print "  list"
 	print "  create <address>"
-	print "  remove <path>"
+	print "  remove <address|path>"
 	print "  discover <address> [pattern]"
 	print "  class <address>"
 	print "  name <address>"
@@ -39,9 +39,13 @@ if (sys.argv[1] == "create"):
 
 if (sys.argv[1] == "remove"):
 	if (len(sys.argv) < 3):
-		print "Need object path parameter"
+		print "Need address or object path parameter"
 	else:
-		adapter.RemoveDevice(sys.argv[2])
+		try:
+			path = adapter.FindDevice(sys.argv[2])
+		except:
+			path = sys.argv[2]
+		adapter.RemoveDevice(path)
 	sys.exit(0)
 
 if (sys.argv[1] == "discover"):