ratabgctl.test: reset the test device before each test

Now that we have a method which resets the device, use it so we can
rely on the state of the device.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>

tools/ratbagctl.in

@@ -1599,6 +1599,18 @@ class RatbagParserRoot(object):
         self.parser.print_help()
 
 
+def open_ratbagd():
+    try:
+        r = Ratbagd()
+    except RatbagdDBusUnavailable:
+        print("Unable to connect to ratbagd over dbus")
+        return None
+    else:
+        if not r.devices:
+            print("No devices available.")
+        return r
+
+
 def main(argv):
     if not argv:
         argv = ["list"]
@@ -1606,14 +1618,9 @@ def main(argv):
     parser = RatbagParserRoot(parser_def)
     cmd = parser.parse(argv)
 
-    try:
-        r = Ratbagd()
-        if not r.devices:
-            print("No devices available.")
-
+    r = open_ratbagd()
+    if r is not None:
         cmd.func(r, cmd)
-    except RatbagdDBusUnavailable:
-        print("Unable to connect to ratbagd over dbus")
 
 if __name__ == "__main__":
     main(sys.argv[1:])

tools/ratbagctl.test.in

@@ -25,6 +25,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+import imp
 import os
 import shutil
 import subprocess
@@ -38,7 +39,31 @@ DBUS_CONF_DIR = '/etc/dbus-1/system.d'
 DBUS_CONF_NAME = 'org.freedesktop.ratbag_devel1.conf'
 DBUS_CONF_PATH = os.path.join(DBUS_CONF_DIR, DBUS_CONF_NAME)
 
+
+def import_non_standard_path(name, path):
+    # Fast path: see if the module has already been imported.
+    try:
+        return sys.modules[name]
+    except KeyError:
+        pass
+
+    # If any of the following calls raises an exception,
+    # there's a problem we can't handle -- let the caller handle it.
+
+    with open(path, 'rb') as fp:
+        module = imp.load_module(name, fp, os.path.basename(path), ('.py', 'rb', imp.PY_SOURCE))
+
+    return module
+
+ratbagctl = import_non_standard_path(RATBAGCTL_NAME, RATBAGCTL_PATH)
+
+
 class TestRatbagCtl(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestRatbagCtl, cls).setUpClass()
+        cls.reset_test_device()
+
     @classmethod
     def run_ratbagctl(cls, params):
         ratbagctl = subprocess.Popen(" ".join([RATBAGCTL_PATH, params]),
@@ -52,6 +77,11 @@ class TestRatbagCtl(unittest.TestCase):
                 stdout.decode('ascii').rstrip('\n'),
                 stderr.decode('ascii').rstrip('\n'))
 
+    @classmethod
+    def reset_test_device(cls):
+        global ratbagd
+        ratbagd._dbus_call("ResetTestDevice", "")
+
     def launch_good_test(self, params):
         returncode, stdout, stderr = self.run_ratbagctl(params)
         self.assertEqual(returncode, 0)
@@ -392,7 +422,7 @@ class TestRatbgagCtlLED(TestRatbagCtl):
 
 
 def setUpModule():
-    global ratbagd_process
+    global ratbagd_process, ratbagd
     # first copy the policy for the ratbagd daemon to be allowed to run
     shutil.copy(os.path.join('@MESON_BUILD_ROOT@', DBUS_CONF_NAME), DBUS_CONF_PATH)
 
@@ -400,6 +430,11 @@ def setUpModule():
 
     ratbagd_process = subprocess.Popen([os.path.join('@MESON_BUILD_ROOT@', "ratbagd.devel")], shell=True)
 
+    os.environ['RATBAGCTL_DEVEL'] = "org.freedesktop.ratbag_devel1_@ratbagd_sha@"
+
+    ratbagd = ratbagctl.open_ratbagd()
+    assert ratbagd is not None
+
 
 def tearDownModule():
     global ratbagd_process