diff options
| -rw-r--r-- | meta/lib/oeqa/core/target/qemu.py | 1 | ||||
| -rw-r--r-- | meta/lib/oeqa/core/target/ssh.py | 3 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/cases/apt.py | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/cases/dnf.py | 3 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/cases/opkg.py | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/context.py | 6 |
6 files changed, 4 insertions, 17 deletions
diff --git a/meta/lib/oeqa/core/target/qemu.py b/meta/lib/oeqa/core/target/qemu.py index 26c3ea49c2f..7d588495c6c 100644 --- a/meta/lib/oeqa/core/target/qemu.py +++ b/meta/lib/oeqa/core/target/qemu.py @@ -28,7 +28,6 @@ class OEQemuTarget(OESSHTarget): super().__init__(logger, target_ip, server_ip, timeout, user, port) - self.server_port = 0 self.machine = machine self.rootfs = rootfs self.kernel = kernel diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 7054c3f7ca1..2e9990be060 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -15,7 +15,7 @@ from . import OETarget class OESSHTarget(OETarget): def __init__(self, logger, target_ip, server_ip, timeout=300, user='root', - port=None, server_port=0, **kwargs): + port=None, **kwargs): if not logger: logger = logging.getLogger('target') logger.setLevel(logging.INFO) @@ -28,7 +28,6 @@ class OESSHTarget(OETarget): logger.addHandler(fileHandler) super().__init__(logger, target_ip, server_ip) - self.server_port = server_port self.timeout = timeout self.user = user ssh_options = [ diff --git a/meta/lib/oeqa/runtime/cases/apt.py b/meta/lib/oeqa/runtime/cases/apt.py index 53745df93f9..ed531a619aa 100644 --- a/meta/lib/oeqa/runtime/cases/apt.py +++ b/meta/lib/oeqa/runtime/cases/apt.py @@ -22,9 +22,7 @@ class AptRepoTest(AptTest): @classmethod def setUpClass(cls): service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_DEB'], 'all') - cls.repo_server = HTTPService(service_repo, - '0.0.0.0', port=cls.tc.target.server_port, - logger=cls.tc.logger) + cls.repo_server = HTTPService(service_repo, '0.0.0.0', logger=cls.tc.logger) cls.repo_server.start() @classmethod diff --git a/meta/lib/oeqa/runtime/cases/dnf.py b/meta/lib/oeqa/runtime/cases/dnf.py index f40c63026e5..937acaab597 100644 --- a/meta/lib/oeqa/runtime/cases/dnf.py +++ b/meta/lib/oeqa/runtime/cases/dnf.py @@ -53,8 +53,7 @@ class DnfRepoTest(DnfTest): @classmethod def setUpClass(cls): cls.repo_server = HTTPService(os.path.join(cls.tc.td['WORKDIR'], 'oe-testimage-repo'), - '0.0.0.0', port=cls.tc.target.server_port, - logger=cls.tc.logger) + '0.0.0.0', logger=cls.tc.logger) cls.repo_server.start() @classmethod diff --git a/meta/lib/oeqa/runtime/cases/opkg.py b/meta/lib/oeqa/runtime/cases/opkg.py index 9cfee1cd886..581ddf58749 100644 --- a/meta/lib/oeqa/runtime/cases/opkg.py +++ b/meta/lib/oeqa/runtime/cases/opkg.py @@ -25,9 +25,7 @@ class OpkgRepoTest(OpkgTest): if cls.tc.td["MULTILIB_VARIANTS"]: allarchfeed = cls.tc.td["TUNE_PKGARCH"] service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_IPK'], allarchfeed) - cls.repo_server = HTTPService(service_repo, - '0.0.0.0', port=cls.tc.target.server_port, - logger=cls.tc.logger) + cls.repo_server = HTTPService(service_repo, '0.0.0.0', logger=cls.tc.logger) cls.repo_server.start() @classmethod diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py index 186161b8e02..672ec8de66a 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py @@ -100,12 +100,6 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): target_ip = target_ip_port[0] kwargs['port'] = target_ip_port[1] - if server_ip: - server_ip_port = server_ip.split(':') - if len(server_ip_port) == 2: - server_ip = server_ip_port[0] - kwargs['server_port'] = int(server_ip_port[1]) - if target_type == 'simpleremote': target = OESSHTarget(logger, target_ip, server_ip, **kwargs) elif target_type == 'qemu': |