dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix broken tests 

(cherry picked from commit 00e1072ee5abbc92b5df57e10cadb638d583d971)

Conflicts:
	tests/test_util.py
This commit is contained in:
Jeff Forcier 2012-05-07 22:03:13 -07:00
parent 01735419f3
commit f04ddd420d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/test_util.py
View File

@ -120,12 +120,19 @@ class UtilTest (unittest.TestCase):
global test_config_file global test_config_file
f = cStringIO.StringIO(test_config_file) f = cStringIO.StringIO(test_config_file)
config = paramiko.util.parse_ssh_config(f) config = paramiko.util.parse_ssh_config(f)
c = paramiko.util.lookup_ssh_host_config('irc.danger.com', config) for host, values in {
self.assertEquals(c, {'identityfile': '~/.ssh/id_rsa', 'user': 'robey', 'crazy': 'something dumb '}) 'irc.danger.com': {'user': 'robey', 'crazy': 'something dumb '},
c = paramiko.util.lookup_ssh_host_config('irc.example.com', config) 'irc.example.com': {'user': 'bjork', 'crazy': 'something dumb ', 'port': '3333'},
self.assertEquals(c, {'identityfile': '~/.ssh/id_rsa', 'user': 'bjork', 'crazy': 'something dumb ', 'port': '3333'}) 'spoo.example.com': {'user': 'bjork', 'crazy': 'something else', 'port': '3333'}
c = paramiko.util.lookup_ssh_host_config('spoo.example.com', config) }.items():
self.assertEquals(c, {'identityfile': '~/.ssh/id_rsa', 'user': 'bjork', 'crazy': 'something else', 'port': '3333'}) values = dict(values,
hostname=host,
identityfile=os.path.expanduser("~/.ssh/id_rsa")
)
self.assertEquals(
paramiko.util.lookup_ssh_host_config(host, config),
values
)
def test_4_generate_key_bytes(self): def test_4_generate_key_bytes(self):
x = paramiko.util.generate_key_bytes(SHA, 'ABCDEFGH', 'This is my secret passphrase.', 64) x = paramiko.util.generate_key_bytes(SHA, 'ABCDEFGH', 'This is my secret passphrase.', 64)