summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/oeqa/selftest/cases/updater.py37
1 files changed, 0 insertions, 37 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 08521d5..898096c 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -67,35 +67,6 @@ class GeneralTests(OESelftestTestCase):
67 self.assertEqual(result.status, 0, 67 self.assertEqual(result.status, 0,
68 "Java not found. Do you have a JDK installed on your host machine?") 68 "Java not found. Do you have a JDK installed on your host machine?")
69 69
70 def test_add_package(self):
71 deploydir = get_bb_var('DEPLOY_DIR_IMAGE')
72 imagename = get_bb_var('IMAGE_LINK_NAME', 'core-image-minimal')
73 image_path = deploydir + '/' + imagename + '.ota-ext4'
74 logger = logging.getLogger("selftest")
75
76 logger.info('Running bitbake with man in the image package list')
77 self.append_config('IMAGE_INSTALL_append = " man "')
78 bitbake('-c cleanall man-db')
79 bitbake('core-image-minimal')
80 result = runCmd('oe-pkgdata-util find-path /usr/bin/man')
81 self.assertEqual(result.output, 'man-db: /usr/bin/man')
82 path1 = os.path.realpath(image_path)
83 size1 = os.path.getsize(path1)
84 logger.info('First image %s has size %i' % (path1, size1))
85
86 logger.info('Running bitbake without man in the image package list')
87 self.append_config('IMAGE_INSTALL_remove = " man "')
88 bitbake('-c cleanall man-db')
89 bitbake('core-image-minimal')
90 result = runCmd('oe-pkgdata-util find-path /usr/bin/man', ignore_status=True)
91 self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output)
92 self.assertEqual(result.output, 'ERROR: Unable to find any package producing path /usr/bin/man')
93 path2 = os.path.realpath(image_path)
94 size2 = os.path.getsize(path2)
95 logger.info('Second image %s has size %i', path2, size2)
96 self.assertNotEqual(path1, path2, "Image paths are identical; image was not rebuilt.")
97 self.assertNotEqual(size1, size2, "Image sizes are identical; image was not rebuilt.")
98
99 70
100class AktualizrToolsTests(OESelftestTestCase): 71class AktualizrToolsTests(OESelftestTestCase):
101 72
@@ -235,7 +206,6 @@ class RpiTests(OESelftestTestCase):
235 def setUpLocal(self): 206 def setUpLocal(self):
236 # Add layers before changing the machine type, otherwise the sanity 207 # Add layers before changing the machine type, otherwise the sanity
237 # checker complains loudly. 208 # checker complains loudly.
238 layer_python = "meta-openembedded/meta-python"
239 layer_rpi = "meta-raspberrypi" 209 layer_rpi = "meta-raspberrypi"
240 layer_upd_rpi = "meta-updater-raspberrypi" 210 layer_upd_rpi = "meta-updater-raspberrypi"
241 result = runCmd('bitbake-layers show-layers') 211 result = runCmd('bitbake-layers show-layers')
@@ -244,11 +214,6 @@ class RpiTests(OESelftestTestCase):
244 # layers we need aren't where we expect them, we are out of luck. 214 # layers we need aren't where we expect them, we are out of luck.
245 path = os.path.abspath(os.path.dirname(__file__)) 215 path = os.path.abspath(os.path.dirname(__file__))
246 metadir = path + "/../../../../../" 216 metadir = path + "/../../../../../"
247 if re.search(layer_python, result.output) is None:
248 self.meta_python = metadir + layer_python
249 runCmd('bitbake-layers add-layer "%s"' % self.meta_python)
250 else:
251 self.meta_python = None
252 if re.search(layer_rpi, result.output) is None: 217 if re.search(layer_rpi, result.output) is None:
253 self.meta_rpi = metadir + layer_rpi 218 self.meta_rpi = metadir + layer_rpi
254 runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi) 219 runCmd('bitbake-layers add-layer "%s"' % self.meta_rpi)
@@ -284,8 +249,6 @@ class RpiTests(OESelftestTestCase):
284 runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True) 249 runCmd('bitbake-layers remove-layer "%s"' % self.meta_upd_rpi, ignore_status=True)
285 if self.meta_rpi: 250 if self.meta_rpi:
286 runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True) 251 runCmd('bitbake-layers remove-layer "%s"' % self.meta_rpi, ignore_status=True)
287 if self.meta_python:
288 runCmd('bitbake-layers remove-layer "%s"' % self.meta_python, ignore_status=True)
289 252
290 def test_rpi(self): 253 def test_rpi(self):
291 logger = logging.getLogger("selftest") 254 logger = logging.getLogger("selftest")