[PATCH 1/1] backport pyanaconda_tests/keyboard_test.py updates from master

atodorov installerbot-noreply at redhat.com
Fri Feb 27 10:10:18 UTC 2015


From: Alexander Todorov <atodorov at redhat.com>

---
 tests/pyanaconda_tests/keyboard_test.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/pyanaconda_tests/keyboard_test.py b/tests/pyanaconda_tests/keyboard_test.py
index a8e9c75..8bad3f6 100644
--- a/tests/pyanaconda_tests/keyboard_test.py
+++ b/tests/pyanaconda_tests/keyboard_test.py
@@ -55,6 +55,24 @@ def layout_variant_parsing_test(self):
         with self.assertRaises(keyboard.InvalidLayoutVariantSpec):
             layout, variant = keyboard.parse_layout_variant("cz (&*&*)")
 
+    def layout_variant_joining_test(self):
+        """Should correctly join keyboard layout and variant to a string spec."""
+
+        # both layout and variant specified
+        self.assertEqual(keyboard._join_layout_variant("cz", "qwerty"),
+                         "cz (qwerty)")
+
+        # no variant specified
+        self.assertEqual(keyboard._join_layout_variant("cz"), "cz")
+
+    def layout_variant_parse_join_test(self):
+        """Parsing and joining valid layout and variant spec should have no effect."""
+
+        specs = ("cz", "cz (qwerty)")
+        for spec in specs:
+            (layout, variant) = keyboard.parse_layout_variant(spec)
+            self.assertEqual(spec, keyboard._join_layout_variant(layout, variant))
+
     def layout_variant_normalize_test(self):
         """Normalizing layout and variant strings should work as expected."""
 


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/e44b5bdcf04dbd86f4761eba6f7fc24f293a1d32


More information about the anaconda-patches mailing list