test: properly release a few leaking litest device
authorPeter Hutterer <peter.hutterer@who-t.net>
Thu, 26 Jul 2018 00:38:16 +0000 (10:38 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 26 Jul 2018 01:51:26 +0000 (11:51 +1000)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
test/test-touchpad-tap.c
test/test-touchpad.c

index 98e72ef..6471d9c 100644 (file)
@@ -3403,6 +3403,8 @@ START_TEST(touchpad_tap_palm_dwt_tap)
        libinput_dispatch(li);
 
        litest_assert_empty_queue(li);
+
+       litest_delete_device(keyboard);
 }
 END_TEST
 
index b4b28f0..eb21b96 100644 (file)
@@ -6068,7 +6068,7 @@ START_TEST(touchpad_suspend_abba)
                        continue;
 
                if (other == SUSPEND_EXT_MOUSE && litest_touchpad_is_external(tp))
-                       return;
+                       goto out;
 
                /* That transition is tested elsewhere and has a different
                 * behavior */
@@ -6167,6 +6167,7 @@ START_TEST(touchpad_suspend_abba)
                assert_touchpad_moves(tp);
        }
 
+out:
        litest_delete_device(lid);
        litest_delete_device(tabletmode);
        litest_delete_device(extmouse);
@@ -6201,7 +6202,7 @@ START_TEST(touchpad_suspend_abab)
                        continue;
 
                if (other == SUSPEND_EXT_MOUSE && litest_touchpad_is_external(tp))
-                       return;
+                       goto out;
 
                /* That transition is tested elsewhere and has a different
                 * behavior */
@@ -6317,6 +6318,7 @@ START_TEST(touchpad_suspend_abab)
                assert_touchpad_moves(tp);
        }
 
+out:
        litest_delete_device(lid);
        litest_delete_device(tabletmode);
        litest_delete_device(extmouse);