test: restore log priority after each test
authorPeter Hutterer <peter.hutterer@who-t.net>
Fri, 23 May 2014 04:13:39 +0000 (14:13 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Fri, 30 May 2014 01:55:23 +0000 (11:55 +1000)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
test/log.c

index 0c5508f760d4bf5baf7c373b75b7c8d578ed5f12..a28182072ce64e1d6f8656202d950215750995b5 100644 (file)
@@ -74,6 +74,7 @@ END_TEST
 START_TEST(log_handler_invoked)
 {
        struct libinput *li;
+       enum libinput_log_priority pri = libinput_log_get_priority();
 
        libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_DEBUG);
        libinput_log_set_handler(simple_log_handler, NULL);
@@ -86,12 +87,14 @@ START_TEST(log_handler_invoked)
        log_handler_called = 0;
 
        libinput_destroy(li);
+       libinput_log_set_priority(pri);
 }
 END_TEST
 
 START_TEST(log_userdata_NULL)
 {
        struct libinput *li;
+       enum libinput_log_priority pri = libinput_log_get_priority();
 
        libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_DEBUG);
        libinput_log_set_handler(simple_log_handler, NULL);
@@ -104,12 +107,15 @@ START_TEST(log_userdata_NULL)
        log_handler_called = 0;
 
        libinput_destroy(li);
+
+       libinput_log_set_priority(pri);
 }
 END_TEST
 
 START_TEST(log_userdata)
 {
        struct libinput *li;
+       enum libinput_log_priority pri = libinput_log_get_priority();
 
        libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_DEBUG);
        libinput_log_set_handler(simple_log_handler, &li);
@@ -122,12 +128,14 @@ START_TEST(log_userdata)
        log_handler_called = 0;
 
        libinput_destroy(li);
+       libinput_log_set_priority(pri);
 }
 END_TEST
 
 START_TEST(log_handler_NULL)
 {
        struct libinput *li;
+       enum libinput_log_priority pri = libinput_log_get_priority();
 
        libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_DEBUG);
        libinput_log_set_handler(NULL, NULL);
@@ -141,12 +149,14 @@ START_TEST(log_handler_NULL)
        libinput_log_set_handler(simple_log_handler, NULL);
 
        libinput_destroy(li);
+       libinput_log_set_priority(pri);
 }
 END_TEST
 
 START_TEST(log_priority)
 {
        struct libinput *li;
+       enum libinput_log_priority pri = libinput_log_get_priority();
 
        libinput_log_set_priority(LIBINPUT_LOG_PRIORITY_ERROR);
        libinput_log_set_handler(simple_log_handler, NULL);
@@ -164,6 +174,7 @@ START_TEST(log_priority)
        log_handler_called = 0;
 
        libinput_destroy(li);
+       libinput_log_set_priority(pri);
 }
 END_TEST