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): | |||
1025 | result = runCmd('devtool deploy-target -n %s root@localhost' % testrecipe) | 1025 | result = runCmd('devtool deploy-target -n %s root@localhost' % testrecipe) |
1026 | self.assertIn(' %s' % testfile, result.output) | 1026 | self.assertIn(' %s' % testfile, result.output) |
1027 | # Boot the image | 1027 | # Boot the image |
1028 | with runqemu(testimage, self) as qemu: | 1028 | with runqemu(testimage) as qemu: |
1029 | # Now really test deploy-target | 1029 | # Now really test deploy-target |
1030 | result = runCmd('devtool deploy-target -c %s root@%s' % (testrecipe, qemu.ip)) | 1030 | result = runCmd('devtool deploy-target -c %s root@%s' % (testrecipe, qemu.ip)) |
1031 | # Run a test command to see if it was installed properly | 1031 | # 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): | |||
31 | # Build a core-image-minimal | 31 | # Build a core-image-minimal |
32 | bitbake('core-image-minimal') | 32 | bitbake('core-image-minimal') |
33 | 33 | ||
34 | with runqemu("core-image-minimal", self) as qemu: | 34 | with runqemu("core-image-minimal") as qemu: |
35 | # Attempt to ssh with each user into qemu with empty password | 35 | # Attempt to ssh with each user into qemu with empty password |
36 | for user in [self.root_user, self.test_user]: | 36 | for user in [self.root_user, self.test_user]: |
37 | ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog, user=user) | 37 | ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog, user=user) |
@@ -58,7 +58,7 @@ class ImageFeatures(oeSelfTest): | |||
58 | # Build a core-image-minimal | 58 | # Build a core-image-minimal |
59 | bitbake('core-image-minimal') | 59 | bitbake('core-image-minimal') |
60 | 60 | ||
61 | with runqemu("core-image-minimal", self) as qemu: | 61 | with runqemu("core-image-minimal") as qemu: |
62 | # Attempt to ssh with each user into qemu with empty password | 62 | # Attempt to ssh with each user into qemu with empty password |
63 | for user in [self.root_user, self.test_user]: | 63 | for user in [self.root_user, self.test_user]: |
64 | ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog, user=user) | 64 | ssh = SSHControl(ip=qemu.ip, logfile=qemu.sshlog, user=user) |
@@ -112,7 +112,7 @@ class ImageFeatures(oeSelfTest): | |||
112 | self.fail('No rpm package found in image') | 112 | self.fail('No rpm package found in image') |
113 | 113 | ||
114 | # Now do a couple of runtime tests | 114 | # Now do a couple of runtime tests |
115 | with runqemu("core-image-minimal", self) as qemu: | 115 | with runqemu("core-image-minimal") as qemu: |
116 | command = "rpm --version" | 116 | command = "rpm --version" |
117 | status, output = qemu.run(command) | 117 | status, output = qemu.run(command) |
118 | self.assertEqual(0, status, 'Failed to run command "%s": %s' % (command, output)) | 118 | 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= | |||
178 | 178 | ||
179 | 179 | ||
180 | @contextlib.contextmanager | 180 | @contextlib.contextmanager |
181 | def runqemu(pn, test): | 181 | def runqemu(pn): |
182 | 182 | ||
183 | import bb.tinfoil | 183 | import bb.tinfoil |
184 | import bb.build | 184 | import bb.build |