[svn r63597] remove unused code. fix errors.
--HG-- branch : trunk
This commit is contained in:
		
							parent
							
								
									f14b0c90d9
								
							
						
					
					
						commit
						6bf57efa8f
					
				|  | @ -19,8 +19,8 @@ class TXNode(object): | ||||||
|         self.putevent = putevent  |         self.putevent = putevent  | ||||||
|         self.gateway = gateway |         self.gateway = gateway | ||||||
|         self.channel = install_slave(gateway, config) |         self.channel = install_slave(gateway, config) | ||||||
|         self.channel.setcallback(self.callback, endmarker=self.ENDMARK) |  | ||||||
|         self._sendslaveready = slaveready |         self._sendslaveready = slaveready | ||||||
|  |         self.channel.setcallback(self.callback, endmarker=self.ENDMARK) | ||||||
|         self._down = False |         self._down = False | ||||||
| 
 | 
 | ||||||
|     def notify(self, eventname, *args, **kwargs): |     def notify(self, eventname, *args, **kwargs): | ||||||
|  | @ -63,7 +63,7 @@ class TXNode(object): | ||||||
|         except: |         except: | ||||||
|             excinfo = py.code.ExceptionInfo() |             excinfo = py.code.ExceptionInfo() | ||||||
|             print "!" * 20, excinfo |             print "!" * 20, excinfo | ||||||
|             self.notify_internal(excinfo) |             self.config.pytestplugins.notify_exception(excinfo) | ||||||
| 
 | 
 | ||||||
|     def send(self, item): |     def send(self, item): | ||||||
|         assert item is not None |         assert item is not None | ||||||
|  |  | ||||||
|  | @ -12,19 +12,6 @@ from py.__.test import event | ||||||
| from py.__.test.outcome import Exit | from py.__.test.outcome import Exit | ||||||
| from py.__.test.dist.mypickle import ImmutablePickler | from py.__.test.dist.mypickle import ImmutablePickler | ||||||
| 
 | 
 | ||||||
| class RobustRun(object): |  | ||||||
|     """ a robust setup/execute/teardown protocol used both for test collectors  |  | ||||||
|         and test items.  |  | ||||||
|     """ |  | ||||||
|     def __init__(self, colitem, pdb=None): |  | ||||||
|         self.colitem = colitem  |  | ||||||
|         self.getcapture = colitem.config._getcapture  |  | ||||||
|         self.pdb = pdb  |  | ||||||
| 
 |  | ||||||
|     def __repr__(self): |  | ||||||
|         return "<%s colitem=%s>" %(self.__class__.__name__, self.colitem) |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| def basic_run_report(item, pdb=None): | def basic_run_report(item, pdb=None): | ||||||
|     """ return report about setting up and running a test item. """  |     """ return report about setting up and running a test item. """  | ||||||
|     excinfo = None |     excinfo = None | ||||||
|  |  | ||||||
|  | @ -1,6 +1,5 @@ | ||||||
| import py | import py | ||||||
| from py.__.test.runner import basic_run_report, forked_run_report, basic_collect_report | from py.__.test.runner import basic_run_report, forked_run_report, basic_collect_report | ||||||
| from py.__.test.runner import RobustRun |  | ||||||
| from py.__.code.excinfo import ReprExceptionInfo | from py.__.code.excinfo import ReprExceptionInfo | ||||||
| 
 | 
 | ||||||
| class BaseTests: | class BaseTests: | ||||||
|  | @ -262,10 +261,3 @@ class TestCollectionEvent: | ||||||
|         assert ev.skipped  |         assert ev.skipped  | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| class TestRunnerRepr: |  | ||||||
|     def test_runner_repr(self, testdir): |  | ||||||
|         item = testdir.getitem("def test_func(): pass") |  | ||||||
|         robustrun = RobustRun(item) |  | ||||||
|         r = repr(robustrun) |  | ||||||
|         assert r |  | ||||||
|         assert r.find(item.name) != -1 |  | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue