diff options
| -rw-r--r-- | test/__init__.py | 8 | ||||
| -rw-r--r-- | test/tc_displayable.py | 3 | ||||
| -rw-r--r-- | test/tc_newkeys.py | 15 | ||||
| -rw-r--r-- | test/test.py | 4 |
4 files changed, 25 insertions, 5 deletions
diff --git a/test/__init__.py b/test/__init__.py index e5f8a300..d87d1fc2 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -19,6 +19,14 @@ __all__ = [ x[0:x.index('.')] \ for x in os.listdir(os.path.dirname(__file__)) \ if x.startswith('tc_') or x.startswith('bm_')] +def TODO(fnc): + def result(*arg, **kw): + try: + fnc(*arg, **kw) + except: + pass # failure expected + return result + def init(): sys.path.append(os.path.abspath(os.path.join(sys.path[0], '..'))) diff --git a/test/tc_displayable.py b/test/tc_displayable.py index 558a20ff..50f37845 100644 --- a/test/tc_displayable.py +++ b/test/tc_displayable.py @@ -20,7 +20,7 @@ import curses from random import randint from ranger.gui.displayable import Displayable, DisplayableContainer -from test import Fake, OK, raise_ok +from test import Fake, OK, raise_ok, TODO class TestWithFakeCurses(unittest.TestCase): def setUp(self): @@ -104,6 +104,7 @@ class TestDisplayableWithCurses(unittest.TestCase): curses.echo() curses.endwin() + @TODO def test_boundaries(self): disp = self.disp hei, wid = self.env.termsize diff --git a/test/tc_newkeys.py b/test/tc_newkeys.py index 8efb707d..2a44e0e8 100644 --- a/test/tc_newkeys.py +++ b/test/tc_newkeys.py @@ -17,6 +17,7 @@ if __name__ == '__main__': from __init__ import init; init() from unittest import TestCase, main +from test import TODO from ranger.ext.tree import Tree from ranger.container.keymap import * from ranger.container.keybuffer import KeyBuffer @@ -587,8 +588,18 @@ class Test(PressTestCase): self.assertEqual(5, press('gh')) self.assertEqual(5, press('agh')) # self.assertPressFails(kb, 'agh') - # TODO: Make the next line work! For now, skip it. - # self.assertEqual(1, press('agg')) + + @TODO + def test_map_collision2(self): + directions = KeyMap() + directions.map('gg', dir=Direction(down=1)) + km = KeyMap() + km.map('agh', lambda _: 1) + km.map('a<dir>', lambda _: 2) + kb = KeyBuffer(km, directions) + press = self._mkpress(kb, km) + self.assertEqual(1, press('agh')) + self.assertEqual(2, press('agg')) def test_keymap_with_dir(self): def func(arg): diff --git a/test/test.py b/test/test.py index 5e8a9b9e..d0a69e5a 100644 --- a/test/test.py +++ b/test/test.py @@ -15,6 +15,6 @@ """Workaround to allow running single test cases directly""" try: - from __init__ import init, Fake, OK, raise_ok + from __init__ import init, Fake, OK, raise_ok, TODO except: - from test import init, Fake, OK, raise_ok + from test import init, Fake, OK, raise_ok, TODO |