Merge branch 'fix-ipython-tests' into develop

This commit is contained in:
ZyX 2014-08-20 21:13:12 +04:00
commit e18251d58d

View File

@ -120,12 +120,12 @@ class TestConfig(TestCase):
with IpyPowerline() as powerline: with IpyPowerline() as powerline:
for prompt_type in ['in', 'in2']: for prompt_type in ['in', 'in2']:
powerline.render(matcher_info=prompt_type, segment_info=segment_info) powerline.render(is_prompt=True, matcher_info=prompt_type, segment_info=segment_info)
powerline.render(matcher_info=prompt_type, segment_info=segment_info) powerline.render(is_prompt=True, matcher_info=prompt_type, segment_info=segment_info)
with IpyPowerline() as powerline: with IpyPowerline() as powerline:
for prompt_type in ['out', 'rewrite']: for prompt_type in ['out', 'rewrite']:
powerline.render(matcher_info=prompt_type, segment_info=segment_info) powerline.render(is_prompt=False, matcher_info=prompt_type, segment_info=segment_info)
powerline.render(matcher_info=prompt_type, segment_info=segment_info) powerline.render(is_prompt=False, matcher_info=prompt_type, segment_info=segment_info)
def test_wm(self): def test_wm(self):
from powerline.segments import common from powerline.segments import common