1 files changed, 42 insertions, 10 deletions

diff --git a/lib/oeqa/selftest/updater.py b/lib/oeqa/selftest/updater.py
index 2723b4a..ad99964 100644
--- a/lib/oeqa/selftest/updater.py
+++ b/lib/oeqa/selftest/updater.py
@@ -113,8 +113,14 @@ class GeneralTests(oeSelfTest):
         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('')
+
+class QemuTests(oeSelfTest):
+
+    @classmethod
+    def setUpClass(cls):
+        logger = logging.getLogger("selftest")
+        logger.info('Running bitbake to build core-image-minimal')
+        bitbake('core-image-minimal')
         # Create empty object.
         args = type('', (), {})()
         args.imagename = 'core-image-minimal'
@@ -131,17 +137,43 @@ class GeneralTests(oeSelfTest):
         args.overlay = None
         args.dry_run = False
 
-        qemu_command = QemuCommand(args)
-        cmdline = qemu_command.command_line()
+        cls.qemu = QemuCommand(args)
+        cmdline = cls.qemu.command_line()
         print('Booting image with run-qemu-ota...')
-        s = subprocess.Popen(cmdline)
+        cls.s = subprocess.Popen(cmdline)
         time.sleep(10)
-        print('Machine name (hostname) of device is:')
-        ssh_cmd = ['ssh', '-q', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'StrictHostKeyChecking=no', 'root@localhost', '-p', str(qemu_command.ssh_port), 'hostname']
-        s2 = subprocess.Popen(ssh_cmd)
-        time.sleep(5)
+
+    @classmethod
+    def tearDownClass(cls):
         try:
-            s.terminate()
+            cls.s.terminate()
         except KeyboardInterrupt:
             pass
 
+    def run_test_qemu(self, command):
+        command = ['ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@localhost -p ' +
+                   str(self.qemu.ssh_port) + ' "' + command + '"']
+        s2 = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        value, err = s2.communicate()
+        return value, err
+
+    def test_hostname(self):
+        print('')
+        print('Checking machine name (hostname) of device:')
+        value, err = self.run_test_qemu('hostname')
+        machine = get_bb_var('MACHINE', 'core-image-minimal')
+        self.assertEqual(err, b'', 'Error: ' + err.decode())
+        # Strip off line ending.
+        value_str = value.decode()[:-1]
+        self.assertEqual(value_str, machine,
+                         'MACHINE does not match hostname: ' + machine + ', ' + value_str)
+        print(value_str)
+
+    def test_var_sota(self):
+        print('')
+        print('Checking contents of /var/sota:')
+        value, err = self.run_test_qemu('ls /var/sota')
+        self.assertEqual(err, b'', 'Error: ' + err.decode())
+        print(value.decode())
+
+