Make double-bitbake test actually useful.

* Make sure to remove man package before bitbaking.
* Test that the package exists or not.
* Check the image name and size to make sure it changes.
* Move to appropriate class and rename.

1 files changed, 35 insertions, 8 deletions

diff --git a/lib/oeqa/selftest/updater.py b/lib/oeqa/selftest/updater.py
index ea57f9d..adae081 100644
--- a/lib/oeqa/selftest/updater.py
+++ b/lib/oeqa/selftest/updater.py
@@ -1,12 +1,15 @@
 import unittest
 import os
 import logging
+import subprocess
+import time
 
 from oeqa.selftest.base import oeSelfTest
 from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars
-import subprocess
 from oeqa.selftest.qemucommand import QemuCommand
-import time
+
+DEFAULT_DIR = 'tmp/deploy/images'
+
 
 class SotaToolsTests(oeSelfTest):
 
@@ -23,11 +26,6 @@ class SotaToolsTests(oeSelfTest):
         result = runCmd('%s --help' % p, ignore_status=True)
         self.assertEqual(result.status, 0, "Status not equal to 0. output: %s" % result.output)
 
-    def test_push(self):
-        bitbake('core-image-minimal')
-        self.write_config('IMAGE_INSTALL_append = " man "')
-        bitbake('core-image-minimal')
-
 
 class GarageSignTests(oeSelfTest):
 
@@ -58,13 +56,42 @@ class GeneralTests(oeSelfTest):
         result = runCmd('which java', ignore_status=True)
         self.assertEqual(result.status, 0, "Java not found.")
 
+    def test_add_package(self):
+        print('')
+        machine = get_bb_var('MACHINE', 'core-image-minimal')
+        image_path = DEFAULT_DIR + '/' + machine + '/core-image-minimal-' + machine + '.otaimg'
+        logger = logging.getLogger("selftest")
+
+        logger.info('Running bitbake with man in the image package list')
+        self.write_config('IMAGE_INSTALL_append = " man "')
+        bitbake('-c cleanall man')
+        bitbake('core-image-minimal')
+        result = runCmd('oe-pkgdata-util find-path /usr/bin/man')
+        self.assertEqual(result.output, 'man: /usr/bin/man')
+        path1 = os.path.realpath(image_path)
+        size1 = os.path.getsize(path1)
+        logger.info('First image %s has size %i' % (path1, size1))
+
+        logger.info('Running bitbake without man in the image package list')
+        self.write_config('IMAGE_INSTALL_remove = " man "')
+        bitbake('-c cleanall man')
+        bitbake('core-image-minimal')
+        result = runCmd('oe-pkgdata-util find-path /usr/bin/man', ignore_status=True)
+        self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output)
+        self.assertEqual(result.output, 'ERROR: Unable to find any package producing path /usr/bin/man')
+        path2 = os.path.realpath(image_path)
+        size2 = os.path.getsize(path2)
+        logger.info('Second image %s has size %i' % (path2, size2))
+        self.assertNotEqual(path1, path2, "Image paths are identical; image was not rebuilt.")
+        self.assertNotEqual(size1, size2, "Image sizes are identical; image was not rebuilt.")
+
     def test_qemu(self):
         print('')
         # Create empty object.
         args = type('', (), {})()
         args.imagename = 'core-image-minimal'
         args.mac = None
-        args.dir = 'tmp/deploy/images'
+        args.dir = DEFAULT_DIR
         args.efi = False
         args.machine = None
         args.no_kvm = False