File 0002-testsuite-fix-test-keymap-test.patch of Package systemd-v237-testsuite

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-testsuite-fix-test-keymap-test.patch of Package systemd-v237-testsuite (Revision 05b39b2131cd071a7029f99746698f83)

Currently displaying revision 05b39b2131cd071a7029f99746698f83 , Show latest

From ccd62ffc69816acafa1730a2843db382d9947323 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Mon, 28 Aug 2017 17:18:54 +0200
Subject: [PATCH 2/4] testsuite: fix test-keymap test

---
 src/locale/test-keymap-util.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/locale/test-keymap-util.c b/src/locale/test-keymap-util.c
index 2adda3da2..cb5a3fde4 100644
--- a/src/locale/test-keymap-util.c
+++ b/src/locale/test-keymap-util.c
@@ -109,9 +109,9 @@ static void test_vconsole_convert_to_x11(void) {
         log_info("/* test with known variant, new mapping (es:dvorak) */");
         assert_se(free_and_strdup(&c.vc_keymap, "es-dvorak") >= 0);
 
-        assert_se(vconsole_convert_to_x11(&c) == 0); // FIXME
+        assert_se(vconsole_convert_to_x11(&c) == 1); // FIXME
         assert_se(streq(c.x11_layout, "es"));
-        assert_se(c.x11_variant == NULL); // FIXME: "dvorak"
+        assert_se(streq(c.x11_variant, "dvorak")); // FIXME: "dvorak"
 
         log_info("/* test with old mapping (fr:latin9) */");
         assert_se(free_and_strdup(&c.vc_keymap, "fr-latin9") >= 0);
@@ -187,7 +187,7 @@ static void test_x11_convert_to_vconsole(void) {
         assert_se(free_and_strdup(&c.x11_variant, NULL) >= 0);
 
         assert_se(x11_convert_to_vconsole(&c) == 1);
-        assert_se(streq(c.vc_keymap, "us"));
+        assert_se(streq(c.vc_keymap, "ruwin_alt-UTF-8"));
 
         log_info("/* test with a compound mapping (ru,us:) */");
         assert_se(free_and_strdup(&c.x11_layout, "ru,us") >= 0);
@@ -201,8 +201,8 @@ static void test_x11_convert_to_vconsole(void) {
         assert_se(free_and_strdup(&c.x11_layout, "ru") >= 0);
         assert_se(free_and_strdup(&c.x11_variant, NULL) >= 0);
 
-        assert_se(x11_convert_to_vconsole(&c) == 0);
-        assert_se(streq(c.vc_keymap, "ru"));
+        assert_se(x11_convert_to_vconsole(&c) == 1);
+        assert_se(streq(c.vc_keymap, "ru-cv_latin"));
 }
 
 int main(int argc, char **argv) {
-- 
2.12.3

Places

File 0002-testsuite-fix-test-keymap-test.patch of Package systemd-v237-testsuite (Revision 05b39b2131cd071a7029f99746698f83)

Places