merge
This commit is contained in:
		
							parent
							
								
									c1759fc384
								
							
						
					
					
						commit
						901f764825
					
				| 
						 | 
					@ -1616,6 +1616,7 @@ class FixtureManager:
 | 
				
			||||||
        return fixturenames_closure, arg2fixturedefs
 | 
					        return fixturenames_closure, arg2fixturedefs
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def pytest_generate_tests(self, metafunc):
 | 
					    def pytest_generate_tests(self, metafunc):
 | 
				
			||||||
 | 
					        print "pytest core pytest_generate_tests"
 | 
				
			||||||
        for argname in metafunc.fixturenames:
 | 
					        for argname in metafunc.fixturenames:
 | 
				
			||||||
            faclist = metafunc._arg2fixturedefs.get(argname)
 | 
					            faclist = metafunc._arg2fixturedefs.get(argname)
 | 
				
			||||||
            if faclist is None:
 | 
					            if faclist is None:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue