Use replace_item to add module bar to sys.modules

Tests should not leave modified environment.
This commit is contained in:
ZyX 2014-09-04 20:04:18 +04:00
parent 96b2cb8f10
commit bc557bd656

View File

@ -11,7 +11,7 @@ import tests.vim as vim_module
from tests import TestCase from tests import TestCase
from tests.lib.config_mock import get_powerline, get_powerline_raw, swap_attributes from tests.lib.config_mock import get_powerline, get_powerline_raw, swap_attributes
from tests.lib import Args from tests.lib import Args, replace_item
def highlighted_string(s, group, **kwargs): def highlighted_string(s, group, **kwargs):
@ -438,7 +438,6 @@ class TestSegmentAttributes(TestRender):
def test_no_attributes(self, p, config): def test_no_attributes(self, p, config):
def m1(divider=',', **kwargs): def m1(divider=',', **kwargs):
return divider.join(kwargs.keys()) + divider return divider.join(kwargs.keys()) + divider
sys.modules['bar'] = Args(m1=m1)
config['themes/test/default']['segments'] = { config['themes/test/default']['segments'] = {
'left': [ 'left': [
{ {
@ -446,6 +445,7 @@ class TestSegmentAttributes(TestRender):
} }
] ]
} }
with replace_item(sys.modules, 'bar', Args(m1=m1)):
self.assertRenderEqual(p, '{56} pl,{6-}>>{--}') self.assertRenderEqual(p, '{56} pl,{6-}>>{--}')
@add_args @add_args
@ -464,7 +464,6 @@ class TestSegmentAttributes(TestRender):
} }
} }
} }
sys.modules['bar'] = Args(m1=m1)
config['themes/test/default']['segments'] = { config['themes/test/default']['segments'] = {
'left': [ 'left': [
{ {
@ -472,6 +471,7 @@ class TestSegmentAttributes(TestRender):
} }
] ]
} }
with replace_item(sys.modules, 'bar', Args(m1=m1)):
self.assertRenderEqual(p, '{56} pl;{6-}>>{--}') self.assertRenderEqual(p, '{56} pl;{6-}>>{--}')
@add_args @add_args
@ -483,7 +483,6 @@ class TestSegmentAttributes(TestRender):
return ('-' * amount) + segment['contents'] return ('-' * amount) + segment['contents']
m1.expand = expand m1.expand = expand
sys.modules['bar'] = Args(m1=m1)
config['themes/test/default']['segments'] = { config['themes/test/default']['segments'] = {
'left': [ 'left': [
{ {
@ -492,6 +491,7 @@ class TestSegmentAttributes(TestRender):
} }
] ]
} }
with replace_item(sys.modules, 'bar', Args(m1=m1)):
self.assertRenderEqual(p, '{56} ----pl,{6-}>>{--}', width=10) self.assertRenderEqual(p, '{56} ----pl,{6-}>>{--}', width=10)
@add_args @add_args
@ -503,7 +503,6 @@ class TestSegmentAttributes(TestRender):
return segment['contents'][:-amount] return segment['contents'][:-amount]
m1.truncate = truncate m1.truncate = truncate
sys.modules['bar'] = Args(m1=m1)
config['themes/test/default']['segments'] = { config['themes/test/default']['segments'] = {
'left': [ 'left': [
{ {
@ -511,6 +510,7 @@ class TestSegmentAttributes(TestRender):
} }
] ]
} }
with replace_item(sys.modules, 'bar', Args(m1=m1)):
self.assertRenderEqual(p, '{56} p{6-}>>{--}', width=4) self.assertRenderEqual(p, '{56} p{6-}>>{--}', width=4)