From b690290c3f0699cdb486187d27611e27c17b0714 Mon Sep 17 00:00:00 2001 From: Ed Singleton Date: Fri, 3 Sep 2010 10:09:41 +0100 Subject: [PATCH] Whitespace normalisation inside funcs in test_pytest_nose.py --HG-- branch : trunk --- testing/plugin/test_pytest_nose.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testing/plugin/test_pytest_nose.py b/testing/plugin/test_pytest_nose.py index 56867c631..7a872c6ba 100644 --- a/testing/plugin/test_pytest_nose.py +++ b/testing/plugin/test_pytest_nose.py @@ -8,8 +8,10 @@ def test_nose_setup(testdir): def test_hello(): assert l == [1] + def test_world(): assert l == [1,2] + test_hello.setup = lambda: l.append(1) test_hello.teardown = lambda: l.append(2) """) @@ -34,9 +36,11 @@ def test_nose_setup_func(testdir): def test_hello(): print l assert l == [1] + def test_world(): print l assert l == [1,2] + test_hello.setup = my_setup test_hello.teardown = my_teardown """) @@ -106,7 +110,6 @@ def test_nose_test_generator_fixtures(testdir): # expect.append('teardown') #expect.append('setup') eq_(self.called, expect) - """) result = testdir.runpytest(p, '-p', 'nose') result.stdout.fnmatch_lines([ @@ -118,6 +121,7 @@ def test_module_level_setup(testdir): testdir.makepyfile(""" from nose.tools import with_setup items = {} + def setup(): items[1]=1 @@ -137,7 +141,6 @@ def test_module_level_setup(testdir): def test_local_setup(): assert items[2] == 2 assert 1 not in items - """) result = testdir.runpytest('-p', 'nose') result.stdout.fnmatch_lines([ @@ -148,6 +151,7 @@ def test_module_level_setup(testdir): def test_nose_style_setup_teardown(testdir): testdir.makepyfile(""" l = [] + def setup_module(): l.append(1)