summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2011-06-28 22:02:09 +0100
committerLars Wirzenius <liw@liw.fi>2011-06-28 22:02:09 +0100
commit2850e67282fa59c2c99aa8d3d924b5306167fdf5 (patch)
treede4d8f87b5bba729f63f0d0cad1087d1e6b8d61a
parent336afecca5427070ce97155fe6341a0514500e92 (diff)
downloadsystest-2850e67282fa59c2c99aa8d3d924b5306167fdf5.tar.gz
Add --ssh-port option.
-rwxr-xr-xsystest1
-rwxr-xr-xsystest.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/systest b/systest
index 38190d3..1d5d673 100755
--- a/systest
+++ b/systest
@@ -29,6 +29,7 @@ class SystemTest(cliapp.Application):
def add_settings(self):
self.settings.string(['target'], 'target domain name or IP address')
+ self.settings.integer(['ssh-port'], 'target ssh port', default=22)
self.settings.string(['user'], 'user on target')
self.settings.string(['user-password'], 'password for target user')
diff --git a/systest.py b/systest.py
index b514a12..bdcb3b6 100755
--- a/systest.py
+++ b/systest.py
@@ -59,7 +59,8 @@ class TestCase(unittest.TestCase):
def targetcmd(self, argv, *args, **kwargs):
'''Run command on test target.'''
- full_argv = (['ssh', '-l', self.settings['user'],
+ full_argv = (['ssh', '-l', self.settings['user'],
+ '-p', str(self.settings['ssh-port']),
self.settings['target']] +
argv)
returncode, out, err = self.runcmd(full_argv, *args, **kwargs)