[gnome-control-center/wip/benzea/fix-nm-test] tests: Add new AddAndActivateConnection2 NM DBus method

[Benjamin Berg <bberg src gnome org>]

commit cbd6451b6c4dcebcf9907981ed6f60fa009a8483
Author: Benjamin Berg <bberg redhat com>
Date:   Thu Dec 6 16:17:04 2018 +0100

    tests: Add new AddAndActivateConnection2 NM DBus method
    
    This method will be used by newer libnm versions and not implementing it
    causes libnm to fail during activation, breaking the network manager
    tests in the process.

 tests/network/nm-utils/test-networkmanager-service.py | 6 ++++++
 1 file changed, 6 insertions(+)
---
diff --git a/tests/network/nm-utils/test-networkmanager-service.py 
b/tests/network/nm-utils/test-networkmanager-service.py
index a5984ad78..fcac89e3c 100755
--- a/tests/network/nm-utils/test-networkmanager-service.py
+++ b/tests/network/nm-utils/test-networkmanager-service.py
@@ -859,6 +859,12 @@ class NetworkManager(ExportedObj):
 
     @dbus.service.method(dbus_interface=IFACE_NM, in_signature='a{sa{sv}}oo', out_signature='oo')
     def AddAndActivateConnection(self, connection, devpath, specific_object):
+        return self.AddAndActivateConnection2(connection, devpath, specific_object, dict())
+
+    @dbus.service.method(dbus_interface=IFACE_NM, in_signature='a{sa{sv}}ooa{sv}', out_signature='oo')
+    def AddAndActivateConnection2(self, connection, devpath, specific_object, options):
+        # TODO: Do some processing of the "options" parameter.
+
         device = None
         for d in self.devices:
             if d.path == devpath: