Fix tests in test_object that failed with pytest-5

This commit is contained in:
John Helmert
2019-06-29 19:26:16 -05:00
parent c5f1500ffb
commit 9dbd0549f9

View File

@@ -380,6 +380,7 @@ def test_objects_keymap():
assert keymap.get(Command('exit')) == [] assert keymap.get(Command('exit')) == []
assert keymap.get(Command('PAGE_TOP')) == ['gg'] assert keymap.get(Command('PAGE_TOP')) == ['gg']
assert keymap.get('upvote') == ['b', '<KEY_F5>'] assert keymap.get('upvote') == ['b', '<KEY_F5>']
with pytest.raises(exceptions.ConfigError) as e: with pytest.raises(exceptions.ConfigError) as e:
keymap.get('downvote') keymap.get('downvote')
assert 'DOWNVOTE' in six.text_type(e) assert 'DOWNVOTE' in six.text_type(e)
@@ -389,9 +390,11 @@ def test_objects_keymap():
keymap._keymap = {} keymap._keymap = {}
keymap.set_bindings(bindings) keymap.set_bindings(bindings)
assert keymap.get('refresh') assert keymap.get('refresh')
with pytest.raises(exceptions.ConfigError) as e: with pytest.raises(exceptions.ConfigError) as e:
keymap.get('upvote') keymap.get('upvote')
assert 'UPVOTE' in six.text_type(e) assert 'UPVOTE' in six.text_type(e)
keymap.set_bindings(bindings2) keymap.set_bindings(bindings2)
assert keymap.get('refresh') assert keymap.get('refresh')
assert keymap.get('upvote') assert keymap.get('upvote')
@@ -403,6 +406,7 @@ def test_objects_keymap():
assert KeyMap.parse('<KEY_UP>') == 259 assert KeyMap.parse('<KEY_UP>') == 259
assert KeyMap.parse('<KEY_F5>') == 269 assert KeyMap.parse('<KEY_F5>') == 269
assert KeyMap.parse('gg') == (103, 103) assert KeyMap.parse('gg') == (103, 103)
for key in ('', None, '<lf>', '<DNS>', '<KEY_UD>', '', 'ggg'): for key in ('', None, '<lf>', '<DNS>', '<KEY_UD>', '', 'ggg'):
with pytest.raises(exceptions.ConfigError) as e: with pytest.raises(exceptions.ConfigError) as e:
keymap.parse(key) keymap.parse(key)