tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-29 16:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests failing if inotify not available

Browse Source
This commit is contained in:
Kovid Goyal 2013-05-03 10:34:50 +05:30
parent ad55daf9c3
commit 7b495aff0c
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
powerline/segments/vim.py
View File

@ -11,7 +11,7 @@ except ImportError:
from powerline.bindings.vim import vim_get_func, getbufvar from powerline.bindings.vim import vim_get_func, getbufvar
from powerline.theme import requires_segment_info from powerline.theme import requires_segment_info
from powerline.lib import add_divider_highlight_group from powerline.lib import add_divider_highlight_group
from powerline.lib.vcs import guess from powerline.lib.vcs import guess, tree_status
from powerline.lib.humanize_bytes import humanize_bytes from powerline.lib.humanize_bytes import humanize_bytes
from powerline.lib import wraps_saveargs as wraps from powerline.lib import wraps_saveargs as wraps
from collections import defaultdict from collections import defaultdict
@ -325,7 +325,6 @@ def branch(pl, segment_info, status_colors=True):
branch = repo.branch() branch = repo.branch()
scol = ['branch'] scol = ['branch']
if status_colors: if status_colors:
from powerline.lib.vcs import tree_status
status = tree_status(repo, pl) status = tree_status(repo, pl)
scol.insert(0, 'branch_dirty' if status and status.strip() else 'branch_clean') scol.insert(0, 'branch_dirty' if status and status.strip() else 'branch_clean')
return [{ return [{

40
tests/test_segments.py
View File

@ -77,17 +77,19 @@ class TestCommon(TestCase):
pl = Pl() pl = Pl()
segment_info = {'getcwd': os.getcwd} segment_info = {'getcwd': os.getcwd}
with replace_attr(common, 'guess', lambda path: Args(branch=lambda: os.path.basename(path), status=lambda: None, directory='/tmp/tests')): with replace_attr(common, 'guess', lambda path: Args(branch=lambda: os.path.basename(path), status=lambda: None, directory='/tmp/tests')):
self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=False), with replace_attr(common, 'tree_status', lambda repo, pl: None):
[{'highlight_group': ['branch'], 'contents': 'tests'}]) self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=False),
self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=True), [{'highlight_group': ['branch'], 'contents': 'tests'}])
[{'contents': 'tests', 'highlight_group': ['branch_clean', 'branch']}]) self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=True),
[{'contents': 'tests', 'highlight_group': ['branch_clean', 'branch']}])
with replace_attr(common, 'guess', lambda path: Args(branch=lambda: os.path.basename(path), status=lambda: 'D ', directory='/tmp/tests')): with replace_attr(common, 'guess', lambda path: Args(branch=lambda: os.path.basename(path), status=lambda: 'D ', directory='/tmp/tests')):
self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=False), with replace_attr(common, 'tree_status', lambda repo, pl: 'D '):
[{'highlight_group': ['branch'], 'contents': 'tests'}]) self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=False),
self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=True), [{'highlight_group': ['branch'], 'contents': 'tests'}])
[{'contents': 'tests', 'highlight_group': ['branch_dirty', 'branch']}]) self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=True),
self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=False), [{'contents': 'tests', 'highlight_group': ['branch_dirty', 'branch']}])
[{'highlight_group': ['branch'], 'contents': 'tests'}]) self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=False),
[{'highlight_group': ['branch'], 'contents': 'tests'}])
with replace_attr(common, 'guess', lambda path: None): with replace_attr(common, 'guess', lambda path: None):
self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=False), None) self.assertEqual(common.branch(pl=pl, segment_info=segment_info, status_colors=False), None)
@ -454,15 +456,17 @@ class TestVim(TestCase):
pl = Pl() pl = Pl()
with vim_module._with('buffer', '/foo') as segment_info: with vim_module._with('buffer', '/foo') as segment_info:
with replace_attr(vim, 'guess', lambda path: Args(branch=lambda: os.path.basename(path), status=lambda: None, directory=path)): with replace_attr(vim, 'guess', lambda path: Args(branch=lambda: os.path.basename(path), status=lambda: None, directory=path)):
self.assertEqual(vim.branch(pl=pl, segment_info=segment_info, status_colors=False), with replace_attr(vim, 'tree_status', lambda repo, pl: None):
[{'divider_highlight_group': 'branch:divider', 'highlight_group': ['branch'], 'contents': 'foo'}]) self.assertEqual(vim.branch(pl=pl, segment_info=segment_info, status_colors=False),
self.assertEqual(vim.branch(pl=pl, segment_info=segment_info, status_colors=True), [{'divider_highlight_group': 'branch:divider', 'highlight_group': ['branch'], 'contents': 'foo'}])
[{'divider_highlight_group': 'branch:divider', 'highlight_group': ['branch_clean', 'branch'], 'contents': 'foo'}]) self.assertEqual(vim.branch(pl=pl, segment_info=segment_info, status_colors=True),
[{'divider_highlight_group': 'branch:divider', 'highlight_group': ['branch_clean', 'branch'], 'contents': 'foo'}])
with replace_attr(vim, 'guess', lambda path: Args(branch=lambda: os.path.basename(path), status=lambda: 'DU', directory=path)): with replace_attr(vim, 'guess', lambda path: Args(branch=lambda: os.path.basename(path), status=lambda: 'DU', directory=path)):
self.assertEqual(vim.branch(pl=pl, segment_info=segment_info, status_colors=False), with replace_attr(vim, 'tree_status', lambda repo, pl: 'DU'):
[{'divider_highlight_group': 'branch:divider', 'highlight_group': ['branch'], 'contents': 'foo'}]) self.assertEqual(vim.branch(pl=pl, segment_info=segment_info, status_colors=False),
self.assertEqual(vim.branch(pl=pl, segment_info=segment_info, status_colors=True), [{'divider_highlight_group': 'branch:divider', 'highlight_group': ['branch'], 'contents': 'foo'}])
[{'divider_highlight_group': 'branch:divider', 'highlight_group': ['branch_dirty', 'branch'], 'contents': 'foo'}]) self.assertEqual(vim.branch(pl=pl, segment_info=segment_info, status_colors=True),
[{'divider_highlight_group': 'branch:divider', 'highlight_group': ['branch_dirty', 'branch'], 'contents': 'foo'}])
def test_file_vcs_status(self): def test_file_vcs_status(self):
pl = Pl() pl = Pl()