summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r--meta/lib/oeqa/selftest/devtool.py7
-rw-r--r--meta/lib/oeqa/selftest/imagefeatures.py9
2 files changed, 6 insertions, 10 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index d41af2fb26..2e4b6dada3 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -979,11 +979,10 @@ class DevtoolTests(DevtoolBase):
979 # Additionally we are testing build-time functionality as well, so 979 # Additionally we are testing build-time functionality as well, so
980 # really this has to be done as an oe-selftest test. 980 # really this has to be done as an oe-selftest test.
981 # 981 #
982
983 features = 'MACHINE = "qemux86"\n'
984 self.write_config(features)
985
986 # Check preconditions 982 # Check preconditions
983 machine = get_bb_var('MACHINE')
984 if not machine.startswith('qemu'):
985 self.skipTest('This test only works with qemu machines')
987 if not os.path.exists('/etc/runqemu-nosudo'): 986 if not os.path.exists('/etc/runqemu-nosudo'):
988 self.skipTest('You must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') 987 self.skipTest('You must set up tap devices with scripts/runqemu-gen-tapdevs before running this test')
989 result = runCmd('PATH="$PATH:/sbin:/usr/sbin" ip tuntap show', ignore_status=True) 988 result = runCmd('PATH="$PATH:/sbin:/usr/sbin" ip tuntap show', ignore_status=True)
diff --git a/meta/lib/oeqa/selftest/imagefeatures.py b/meta/lib/oeqa/selftest/imagefeatures.py
index 1c08ce2814..ac8c5ae410 100644
--- a/meta/lib/oeqa/selftest/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/imagefeatures.py
@@ -22,8 +22,7 @@ class ImageFeatures(oeSelfTest):
22 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> 22 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
23 """ 23 """
24 24
25 features = 'MACHINE = "qemux86"\n' 25 features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password"\n'
26 features += 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh empty-root-password allow-empty-password"\n'
27 features += 'INHERIT += "extrausers"\n' 26 features += 'INHERIT += "extrausers"\n'
28 features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) 27 features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user)
29 self.write_config(features) 28 self.write_config(features)
@@ -49,8 +48,7 @@ class ImageFeatures(oeSelfTest):
49 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> 48 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
50 """ 49 """
51 50
52 features = 'MACHINE = "qemux86"\n' 51 features = 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh allow-empty-password"\n'
53 features += 'EXTRA_IMAGE_FEATURES = "ssh-server-openssh allow-empty-password"\n'
54 features += 'INHERIT += "extrausers"\n' 52 features += 'INHERIT += "extrausers"\n'
55 features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user) 53 features += 'EXTRA_USERS_PARAMS = "useradd -p \'\' {}; usermod -s /bin/sh {};"'.format(self.test_user, self.test_user)
56 self.write_config(features) 54 self.write_config(features)
@@ -79,8 +77,7 @@ class ImageFeatures(oeSelfTest):
79 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com> 77 AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
80 """ 78 """
81 79
82 features = 'MACHINE = "qemux86"\n' 80 features = 'PREFERRED_VERSION_rpm = "4.%"\n'
83 features += 'PREFERRED_VERSION_rpm = "4.%"\n'
84 features += 'PREFERRED_VERSION_rpm-native = "4.%"\n' 81 features += 'PREFERRED_VERSION_rpm-native = "4.%"\n'
85 # Use openssh in IMAGE_INSTALL instead of ssh-server-openssh in EXTRA_IMAGE_FEATURES as a workaround for bug 8047 82 # Use openssh in IMAGE_INSTALL instead of ssh-server-openssh in EXTRA_IMAGE_FEATURES as a workaround for bug 8047
86 features += 'IMAGE_INSTALL_append = " openssh"\n' 83 features += 'IMAGE_INSTALL_append = " openssh"\n'