diff options
| author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2014-03-07 11:08:30 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-11 08:11:41 -0700 |
| commit | 517bc165bb96cfc62da8fde23abc315981941d49 (patch) | |
| tree | b1c15637c6071c4a65efe3aa497859df5749824f /meta/lib/oeqa/targetcontrol.py | |
| parent | 6d85ec3a9f65f187a9dc7a74a920d0a1113759eb (diff) | |
| download | poky-517bc165bb96cfc62da8fde23abc315981941d49.tar.gz | |
oeqa/targetcontrol: allow a custom port for SimpleRemoteTarget
We had the ability to use a custom port for the ssh connection,
but we weren't using it.
(From OE-Core rev: c1f2a3c41969df0b7f08cf314b2cb7c9a6030092)
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/targetcontrol.py')
| -rw-r--r-- | meta/lib/oeqa/targetcontrol.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py index d8a6ac03ec..17871f5707 100644 --- a/meta/lib/oeqa/targetcontrol.py +++ b/meta/lib/oeqa/targetcontrol.py | |||
| @@ -144,7 +144,12 @@ class SimpleRemoteTarget(BaseTarget): | |||
| 144 | 144 | ||
| 145 | def __init__(self, d): | 145 | def __init__(self, d): |
| 146 | super(SimpleRemoteTarget, self).__init__(d) | 146 | super(SimpleRemoteTarget, self).__init__(d) |
| 147 | self.ip = d.getVar("TEST_TARGET_IP", True) or bb.fatal('Please set TEST_TARGET_IP with the IP address of the machine you want to run the tests on.') | 147 | addr = d.getVar("TEST_TARGET_IP", True) or bb.fatal('Please set TEST_TARGET_IP with the IP address of the machine you want to run the tests on.') |
| 148 | self.ip = addr.split(":")[0] | ||
| 149 | try: | ||
| 150 | self.port = addr.split(":")[1] | ||
| 151 | except IndexError: | ||
| 152 | self.port = None | ||
| 148 | bb.note("Target IP: %s" % self.ip) | 153 | bb.note("Target IP: %s" % self.ip) |
| 149 | self.server_ip = d.getVar("TEST_SERVER_IP", True) | 154 | self.server_ip = d.getVar("TEST_SERVER_IP", True) |
| 150 | if not self.server_ip: | 155 | if not self.server_ip: |
| @@ -158,7 +163,7 @@ class SimpleRemoteTarget(BaseTarget): | |||
| 158 | super(SimpleRemoteTarget, self).deploy() | 163 | super(SimpleRemoteTarget, self).deploy() |
| 159 | 164 | ||
| 160 | def start(self, params=None): | 165 | def start(self, params=None): |
| 161 | self.connection = SSHControl(self.ip, logfile=self.sshlog) | 166 | self.connection = SSHControl(self.ip, logfile=self.sshlog, port=self.port) |
| 162 | 167 | ||
| 163 | def stop(self): | 168 | def stop(self): |
| 164 | self.connection = None | 169 | self.connection = None |
