Skip to content

Commit dec48e3

Browse files
committed
tests: Use xunit-style setup_method/teardown_method instead of nose-like convention
This was also independently noted by Nikolaos Kakouros @nkakouros in #271
1 parent dda9172 commit dec48e3

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

tests/base.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def configure_global_variables(self):
7272
self.command('let g:taskwiki_taskrc_location="{0}"'.format(self.taskrc_path))
7373
self.command('let g:vimwiki_list = [{"syntax": "%s", "ext": ".txt","path": "%s"}]' % (self.markup, self.dir))
7474

75-
def setup(self):
75+
def setup_method(self):
7676
assert not self.client
7777

7878
self.generate_data()
@@ -89,7 +89,7 @@ def setup(self):
8989
self.filepath = os.path.join(self.dir, 'testwiki.txt')
9090
self.client.edit(self.filepath)
9191

92-
def teardown(self):
92+
def teardown_method(self):
9393
if not self.client:
9494
return
9595

@@ -216,8 +216,8 @@ def test_execute(self):
216216
success = True
217217
break
218218
else:
219-
self.teardown()
220-
self.setup()
219+
self.teardown_method()
220+
self.setup_method()
221221

222222
if not success:
223223
self.check_sanity(soft=False)
@@ -245,9 +245,9 @@ class MultiSyntaxIntegrationTest(IntegrationTest):
245245

246246
markup = None
247247

248-
def setup(self):
248+
def setup_method(self):
249249
if self.markup:
250-
super(MultiSyntaxIntegrationTest, self).setup()
250+
super(MultiSyntaxIntegrationTest, self).setup_method()
251251
else:
252252
pass
253253

tests/test_preset_parsing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55

66
class TestParsingPresetHeader(object):
7-
def setup(self):
7+
def setup_method(self):
88
self.mockvim = MockVim()
99
self.cache = MockCache()
1010

1111
sys.modules['vim'] = self.mockvim
1212
from taskwiki.preset import PresetHeader
1313
self.PresetHeader = PresetHeader
1414

15-
def teardown(self):
15+
def teardown_method(self):
1616
self.mockvim.reset()
1717
self.cache.reset()
1818

tests/test_viewport_parsing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88

99
class TestParsingVimwikiTask(object):
10-
def setup(self):
10+
def setup_method(self):
1111
self.mockvim = MockVim()
1212
self.cache = MockCache()
1313

@@ -19,7 +19,7 @@ def setup(self):
1919
from taskwiki.viewport import ViewPort
2020
self.ViewPort = ViewPort
2121

22-
def teardown(self):
22+
def teardown_method(self):
2323
self.mockvim.reset()
2424
self.cache.reset()
2525

tests/test_vwtask_parsing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66

77
class TestParsingVimwikiTask(object):
8-
def setup(self):
8+
def setup_method(self):
99
self.mockvim = MockVim()
1010
self.cache = MockCache()
1111
sys.modules['vim'] = self.mockvim
1212
from taskwiki.vwtask import VimwikiTask
1313
self.VimwikiTask = VimwikiTask
1414

15-
def teardown(self):
15+
def teardown_method(self):
1616
self.cache.reset()
1717

1818
def test_simple(self):

0 commit comments

Comments
 (0)