functional tests: flatpak

[pmachines.git] / tests / test_functional.py

diff --git a/tests/test_functional.py b/tests/test_functional.py
index db96fa9a990b0c6d4d05d52fde47d0dcc70dcd56..1d1c27a82a1dd64756b12a77ae671f16304399d0 100644 (file)
--- a/tests/test_functional.py
+++ b/tests/test_functional.py
@@ -76,6 +76,9 @@ class FunctionalTests(TestCase):
             self.assertTrue(exists(path + basename(fname)), '%s does not exist' % (path + basename(fname)))
             self.assertTrue(
                 self.__similar_images(
+                    str(Path.home()) + '/.local/share/pmachines/tests/functional_ref_%s/' % _branch() + basename(fname),
+                    path + basename(fname)),
+                'error while comparing %s and %s' % (
                     str(Path.home()) + '/.local/share/pmachines/tests/functional_ref_%s/' % _branch() + basename(fname),
                     path + basename(fname)))
 
@@ -95,19 +98,19 @@ class FunctionalTests(TestCase):
             './dist/Pmachines%s-x86_64.AppImage --functional-test 2' % (bld_branch, bld_branch),
             str(Path.home()) + '/.local/share/pmachines/tests/functional/')
 
-    # def test_flatpak(self):
-    #     info('test_flatpak')
-    #     if environ.get('FUNCTIONALPOST') != '1':
-    #         self.skipTest('skipped functional-post tests')
-    #     bld_branch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[_branch()]
-    #     cmd = 'flatpak update -y it.ya2.Pmachines//%s' % bld_branch
-    #     info('executing: %s' % cmd)
-    #     system(cmd)
-    #     info('executed: %s' % cmd)
-    #     self.__test_template(
-    #         'flatpak run it.ya2.Pmachines//%s --functional-test 1 ;'
-    #         'flatpak run it.ya2.Pmachines//%s --functional-test 2' % (bld_branch, bld_branch),
-    #         str(Path.home()) + '/.var/app/it.ya2.Pmachines/data/pmachines/tests/functional/')
+    def test_flatpak(self):
+        info('test_flatpak')
+        if environ.get('FUNCTIONALPOST') != '1':
+            self.skipTest('skipped functional-post tests')
+        bld_branch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[_branch()]
+        cmd = 'flatpak update -y it.ya2.Pmachines//%s' % bld_branch
+        info('executing: %s' % cmd)
+        system(cmd)
+        info('executed: %s' % cmd)
+        self.__test_template(
+            'flatpak run it.ya2.Pmachines//%s --functional-test 1 ;'
+            'flatpak run it.ya2.Pmachines//%s --functional-test 2' % (bld_branch, bld_branch),
+            str(Path.home()) + '/.var/app/it.ya2.Pmachines/data/pmachines/tests/functional/')
 
     # def __update_itchio(self):
     #     system('/home/flavio/.itch/itch')