diff options
| -rw-r--r-- | meta/lib/oeqa/selftest/devtool.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/imagefeatures.py | 6 | ||||
| -rw-r--r-- | meta/lib/oeqa/utils/commands.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index e5a2134132..036146425b 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -1025,7 +1025,7 @@ class DevtoolTests(DevtoolBase): result = runCmd('devtool deploy-target -n %s root@localhost' % testrecipe) self.assertIn(' %s' % testfile, result.output) # Boot the image - with runqemu(testimage, self) as qemu: + with runqemu(testimage) as qemu: # Now really test deploy-target result = runCmd('devtool deploy-target -c %s root@%s' % (testrecipe, qemu.ip)) # Run a test command to see if it was installed properly diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py index 62ddc52bcc..1c08ce2814 100644 --- a/meta/lib/oeqa/selftest/imagefeatures.py +++ b/meta/lib/oeqa/selftest/imagefeatures.py @@ -31,7 +31,7 @@ class ImageFeatures(oeSelfTest): # Build a core-image-minimal bitbake('core-image-minimal') - with runqemu("core-image-minimal", self) as qemu: + with runqemu("core-image-minimal") as qemu: # Attempt to ssh with each user into qemu with empty password for user in [self.root_user, self.test_user]: ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog, user=user) @@ -58,7 +58,7 @@ class ImageFeatures(oeSelfTest): # Build a core-image-minimal bitbake('core-image-minimal') - with runqemu("core-image-minimal", self) as qemu: + with runqemu("core-image-minimal") as qemu: # Attempt to ssh with each user into qemu with empty password for user in [self.root_user, self.test_user]: ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog, user=user) @@ -112,7 +112,7 @@ class ImageFeatures(oeSelfTest): self.fail('No rpm package found in image') # Now do a couple of runtime tests - with runqemu("core-image-minimal", self) as qemu: + with runqemu("core-image-minimal") as qemu: command = "rpm --version" status, output = qemu.run(command) self.assertEqual(0, status, 'Failed to run command "%s": %s' % (command, output)) diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index dfb6c215bb..93a0e4846b 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -178,7 +178,7 @@ def create_temp_layer(templayerdir, templayername, priority=999, recipepathspec= @contextlib.contextmanager -def runqemu(pn, test): +def runqemu(pn): import bb.tinfoil import bb.build |