[svn r37971] This was there for a reason that we don't want to have different pylib loaded (there was even test for that, apparently killed)
--HG-- branch : trunk
This commit is contained in:
		
							parent
							
								
									845357dcba
								
							
						
					
					
						commit
						1c287a2546
					
				|  | @ -5,7 +5,8 @@ import thread, threading | ||||||
| from py.__.test.rsession.master import MasterNode | from py.__.test.rsession.master import MasterNode | ||||||
| from py.__.test.rsession.slave import setup_slave | from py.__.test.rsession.slave import setup_slave | ||||||
| 
 | 
 | ||||||
| from py.__.test.rsession import repevent  | from py.__.test.rsession import repevent | ||||||
|  | from py.__.execnet.register import PopenCmdGateway | ||||||
| 
 | 
 | ||||||
| class HostInfo(object): | class HostInfo(object): | ||||||
|     """ Class trying to store all necessary attributes |     """ Class trying to store all necessary attributes | ||||||
|  | @ -31,8 +32,9 @@ class HostInfo(object): | ||||||
| 
 | 
 | ||||||
|     def initgateway(self, python="python"): |     def initgateway(self, python="python"): | ||||||
|         assert not hasattr(self, 'gw') |         assert not hasattr(self, 'gw') | ||||||
|         if self.hostname == "localhost":  |         if self.hostname == "localhost": | ||||||
|             gw = py.execnet.PopenGateway(python=python) |             cmd = 'cd ~; %s -u -c "exec input()"' % python | ||||||
|  |             gw = PopenCmdGateway(cmd) | ||||||
|         else: |         else: | ||||||
|             gw = py.execnet.SshGateway(self.hostname,  |             gw = py.execnet.SshGateway(self.hostname,  | ||||||
|                                        remotepython=python) |                                        remotepython=python) | ||||||
|  | @ -76,6 +78,7 @@ class HostRSync(py.execnet.RSync): | ||||||
|         if 'ignores' in kwargs: |         if 'ignores' in kwargs: | ||||||
|             ignores = kwargs.pop('ignores') |             ignores = kwargs.pop('ignores') | ||||||
|         self._ignores = ignores or [] |         self._ignores = ignores or [] | ||||||
|  |         kwargs['delete'] = True | ||||||
|         super(HostRSync, self).__init__(*args, **kwargs) |         super(HostRSync, self).__init__(*args, **kwargs) | ||||||
| 
 | 
 | ||||||
|     def filter(self, path): |     def filter(self, path): | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue