From 1e976a0bf7f94694892005944f8b8fc5d895ab31 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 31 Oct 2017 20:59:09 +0000 Subject: oeqa/selftest/runtime: force empty root password, use helpers to access qemu --- meta/lib/oeqa/selftest/cases/runtime_test.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 7d105f2fed..7ce81c3ff0 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -1,5 +1,6 @@ from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars, runqemu +from oeqa.utils.sshcontrol import SSHControl from oeqa.core.decorator.oeid import OETestID import os import re @@ -243,7 +244,7 @@ postinst-delayed-t \ with self.subTest(init_manager=init_manager, package_class=classes): features = 'MACHINE = "qemux86"\n' features += 'CORE_IMAGE_EXTRA_INSTALL += "%s %s "\n'% (rootfs_pkg, boot_pkg) - features += 'IMAGE_FEATURES += "ssh-server-openssh"\n' + features += 'IMAGE_FEATURES += "empty-root-password ssh-server-openssh"\n' features += 'PACKAGE_CLASSES = "%s"\n' % classes if init_manager == "systemd": features += 'DISTRO_FEATURES_append = " systemd"\n' @@ -262,6 +263,6 @@ postinst-delayed-t \ testcommand = 'ls /etc/' + fileboot_name with runqemu('core-image-minimal') as qemu: - sshargs = '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' - result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand)) - self.assertEqual(result.status, 0, 'File %s was not created at firts boot'% fileboot_name) + ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog) + status, output = ssh.run(testcommand) + self.assertEqual(status, 0, 'File %s was not created at first boot (%s)' % (fileboot_name, output)) -- cgit 1.2.3-korg