flimflam-test: Remove the last agent related code
shill has no concept of agents, and so we don't need to carry this code
forward. Also remove the parts of flimflam.py which are consumed by
this test script.
BUG=chromium-os:38166
TEST=Pylint is slightly happier with this directory.
Change-Id: I63dcf924e95942363750056c355421b2e8c24fe2
Reviewed-on: https://gerrit.chromium.org/gerrit/42185
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>
diff --git a/test/flimflam.py b/test/flimflam.py
index c14717f..82c1c69 100755
--- a/test/flimflam.py
+++ b/test/flimflam.py
@@ -416,12 +416,6 @@
def SetArpGateway(self, do_arp_gateway):
self.manager.SetProperty("ArpGateway", do_arp_gateway)
- def RegisterAgent(self, path):
- return self.manager.RegisterAgent(path)
-
- def UnregisterAgent(self, path):
- return self.manager.UnregisterAgent(path)
-
class DeviceManager(object):
"""Use flimflam to isolate a given interface for testing.
diff --git a/test/test-agent b/test/test-agent
deleted file mode 100755
index 1317f31..0000000
--- a/test/test-agent
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/python
-
-import dbus, flimflam
-import gobject, dbus.service, dbus.mainloop.glib
-import sys
-
-FLIMFLAM = "org.chromium.flimflam"
-
-class Canceled(dbus.DBusException):
- _dbus_error_name = FLIMFLAM + ".Error.Canceled"
-
-class Agent(dbus.service.Object):
- AGENT = FLIMFLAM + ".Agent"
-
- @dbus.service.method(AGENT, in_signature='', out_signature='')
- def Release(self):
- print("Release")
- mainloop.quit()
-
- @dbus.service.method(AGENT, in_signature='oa{sv}', out_signature='a{sv}')
- def RequestInput(self, path, fields):
- print "RequestInput (%s, %s)" % (path, fields)
-
- for k, v in fields.items():
- value = raw_input('%s [%s]: ' % (k, v))
- if value != '':
- fields[k] = dbus.String(value);
-
- print "returning (%s)" % (fields)
-
- return fields
-
- @dbus.service.method(AGENT, in_signature='os', out_signature='')
- def ReportError(self, path, error):
- print "ReportError %s, %s" % (path, error)
- retry = raw_input("Retry service (yes/no): ")
- if (retry == "yes"):
- class Retry(dbus.DBusException):
- _dbus_error_name = AGENT + ".Error.Retry"
-
- raise Retry("retry service")
- else:
- return
-
- @dbus.service.method(AGENT, in_signature='', out_signature='')
- def Cancel(self):
- print "Cancel"
-
-if __name__ == '__main__':
- dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
- bus = dbus.SystemBus()
- flim = flimflam.FlimFlam(bus)
-
- path = "/test/agent"
- object = Agent(bus, path)
- flim.RegisterAgent(path)
-
- mainloop = gobject.MainLoop()
- mainloop.run()
