fix issue257 assertion-triggered compilation of source ending in a
comment line doesn't blow up in python2.5 (fixed through py>=1.4.13.dev6)
This commit is contained in:
		
							parent
							
								
									c8653b4c02
								
							
						
					
					
						commit
						456731ed0f
					
				| 
						 | 
				
			
			@ -1,7 +1,10 @@
 | 
			
		|||
Changes between 2.3.4 and 2.3.5dev
 | 
			
		||||
-----------------------------------
 | 
			
		||||
 | 
			
		||||
- fix issue171 - in assertion rewriting, show the repr of some
 | 
			
		||||
- issue257, assertion-triggered compilation of source ending in a
 | 
			
		||||
  comment line doesn't blow up in python2.5 (fixed through py>=1.4.13.dev6)
 | 
			
		||||
 | 
			
		||||
- issue171 - in assertion rewriting, show the repr of some
 | 
			
		||||
  global variables
 | 
			
		||||
 | 
			
		||||
- fix option help for "-k"
 | 
			
		||||
| 
						 | 
				
			
			@ -21,7 +24,7 @@ Changes between 2.3.4 and 2.3.5dev
 | 
			
		|||
 | 
			
		||||
- ensure OutcomeExceptions like skip/fail have initialized exception attributes
 | 
			
		||||
 | 
			
		||||
- fix issue 260 - don't use nose specials on plain unittest cases
 | 
			
		||||
- issue 260 - don't use nose special setup on plain unittest cases
 | 
			
		||||
 | 
			
		||||
Changes between 2.3.3 and 2.3.4
 | 
			
		||||
-----------------------------------
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,2 +1,2 @@
 | 
			
		|||
#
 | 
			
		||||
__version__ = '2.3.5dev5'
 | 
			
		||||
__version__ = '2.3.5dev6'
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										4
									
								
								setup.py
								
								
								
								
							
							
						
						
									
										4
									
								
								setup.py
								
								
								
								
							| 
						 | 
				
			
			@ -12,7 +12,7 @@ def main():
 | 
			
		|||
        name='pytest',
 | 
			
		||||
        description='py.test: simple powerful testing with Python',
 | 
			
		||||
        long_description = long_description,
 | 
			
		||||
        version='2.3.5dev5',
 | 
			
		||||
        version='2.3.5dev6',
 | 
			
		||||
        url='http://pytest.org',
 | 
			
		||||
        license='MIT license',
 | 
			
		||||
        platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
 | 
			
		||||
| 
						 | 
				
			
			@ -21,7 +21,7 @@ def main():
 | 
			
		|||
        entry_points= make_entry_points(),
 | 
			
		||||
        cmdclass = {'test': PyTest},
 | 
			
		||||
        # the following should be enabled for release
 | 
			
		||||
        install_requires=['py>=1.4.12'],
 | 
			
		||||
        install_requires=['py>=1.4.13dev6'],
 | 
			
		||||
        classifiers=['Development Status :: 6 - Mature',
 | 
			
		||||
                     'Intended Audience :: Developers',
 | 
			
		||||
                     'License :: OSI Approved :: MIT License',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -103,6 +103,19 @@ class TestAssert_reprcompare:
 | 
			
		|||
        expl = ' '.join(callequal('foo', 'bar'))
 | 
			
		||||
        assert 'raised in repr()' not in expl
 | 
			
		||||
 | 
			
		||||
def test_python25_compile_issue257(testdir):
 | 
			
		||||
    testdir.makepyfile("""
 | 
			
		||||
        def test_rewritten():
 | 
			
		||||
            assert 1 == 2
 | 
			
		||||
        # some comment
 | 
			
		||||
    """)
 | 
			
		||||
    result = testdir.runpytest()
 | 
			
		||||
    assert result.ret == 1
 | 
			
		||||
    result.stdout.fnmatch_lines("""
 | 
			
		||||
            *E*assert 1 == 2*
 | 
			
		||||
            *1 failed*
 | 
			
		||||
    """)
 | 
			
		||||
 | 
			
		||||
@needsnewassert
 | 
			
		||||
def test_rewritten(testdir):
 | 
			
		||||
    testdir.makepyfile("""
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue