diff options
| -rw-r--r-- | meta/lib/oeqa/selftest/imagefeatures.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py index 82ea164de1..1795b7bcf3 100644 --- a/meta/lib/oeqa/selftest/imagefeatures.py +++ b/meta/lib/oeqa/selftest/imagefeatures.py | |||
| @@ -68,7 +68,10 @@ class ImageFeatures(oeSelfTest): | |||
| 68 | proc_ssh.terminate() | 68 | proc_ssh.terminate() |
| 69 | 69 | ||
| 70 | # Cleanup | 70 | # Cleanup |
| 71 | killpg(proc_qemu.pid, signal.SIGTERM) | 71 | try: |
| 72 | killpg(proc_qemu.pid, signal.SIGTERM) | ||
| 73 | except: | ||
| 74 | pass | ||
| 72 | 75 | ||
| 73 | @testcase(1115) | 76 | @testcase(1115) |
| 74 | def test_all_users_can_connect_via_ssh_without_password(self): | 77 | def test_all_users_can_connect_via_ssh_without_password(self): |
| @@ -121,7 +124,10 @@ class ImageFeatures(oeSelfTest): | |||
| 121 | proc_ssh.terminate() | 124 | proc_ssh.terminate() |
| 122 | 125 | ||
| 123 | # Cleanup | 126 | # Cleanup |
| 124 | killpg(proc_qemu.pid, signal.SIGTERM) | 127 | try: |
| 128 | killpg(proc_qemu.pid, signal.SIGTERM) | ||
| 129 | except: | ||
| 130 | pass | ||
| 125 | 131 | ||
| 126 | @testcase(1114) | 132 | @testcase(1114) |
| 127 | def test_rpm_version_4_support_on_image(self): | 133 | def test_rpm_version_4_support_on_image(self): |
| @@ -167,7 +173,10 @@ class ImageFeatures(oeSelfTest): | |||
| 167 | 'RPM version is not {}, found instead {}.'.format(rpm_version, found_rpm_version)) | 173 | 'RPM version is not {}, found instead {}.'.format(rpm_version, found_rpm_version)) |
| 168 | 174 | ||
| 169 | # Cleanup (close qemu) | 175 | # Cleanup (close qemu) |
| 170 | killpg(proc_qemu.pid, signal.SIGTERM) | 176 | try: |
| 177 | killpg(proc_qemu.pid, signal.SIGTERM) | ||
| 178 | except: | ||
| 179 | pass | ||
| 171 | 180 | ||
| 172 | @testcase(1116) | 181 | @testcase(1116) |
| 173 | def test_clutter_image_can_be_built(self): | 182 | def test_clutter_image_can_be_built(self): |
