Revision: 178
Author: janne.t.harkonen
Date: Wed Aug 29 22:24:36 2012
Log: fix scp tests after API changes
http://code.google.com/p/robotframework-sshlibrary/source/detail?r=178
Modified:
/trunk/utest/test_scp.py
=======================================
--- /trunk/utest/test_scp.py Fri Aug 24 04:21:00 2012
+++ /trunk/utest/test_scp.py Wed Aug 29 22:24:36 2012
@@ -1,31 +1,10 @@
import unittest
import os
-from SSHLibrary import SSHLibrary
+from SSHLibrary import abstractclient
-
-class _MockClient(object):
-
- def __init__(self):
- self.putfile_record = []
- self.getfile_record = []
- self.homedir = '/home'
-
- def put_file(self, src, dest, mode, newlines):
- self.putfile_record.append(dest)
-
- def get_file(self, src, dest):
- self.getfile_record.append(dest)
-
- create_sftp_client = close_sftp_client = lambda self: None
- create_missing_remote_path = lambda self, x: None
-
-
-class MySSHLibrary(SSHLibrary):
- _create_missing_local_dirs = lambda self, x, y: None
- _get_put_file_sources = _info = lambda self, x: x
- _get_get_file_sources = lambda self, x: x
-
+abstractclient.AbstractSFTPClient._create_client = lambda s, x: None
+abstractclient.AbstractSFTPClient._resolve_homedir = lambda s: '/home'
class TestRemoteAndLocalPathResolution(unittest.TestCase):
@@ -38,11 +17,9 @@
'/opt/Files/BAZ.my']),
(['myfile'], '\\tmp\\', ['/tmp/myfile'])]
for src, dest, exp in data:
- client = _MockClient()
- lib = MySSHLibrary()
- lib._cache.register(client)
- lib.put_file(src, dest, '0744')
- self.assertEquals(client.putfile_record, exp)
+ client = abstractclient.AbstractSFTPClient(None)
+ remote = client._get_put_file_destinations(src, dest, '/')[0]
+ self.assertEquals(remote, exp)
def test_get_file(self):
data = [(['foo.txt'], '/home/test/', ['/home/test/foo.txt']),
@@ -52,11 +29,9 @@
(['/home/baz.file'], '.',
[os.path.join(os.path.abspath(os.curdir), 'baz.file')])]
for src, dest, exp in data:
- client = _MockClient()
- lib = MySSHLibrary()
- lib._cache.register(client)
- lib.get_file(src, dest)
- self.assertEquals(client.getfile_record, exp)
+ client = abstractclient.AbstractSFTPClient(None)
+ local = client._get_get_file_destinations(src, dest)
+ self.assertEquals(local, exp)
if __name__ == '__main__':
