functional tests: flatpak

diff --git a/prj.org b/prj.org
index 4d8b134bbce4e1f886f6dbc194bb4d778e8ac708..29079f0c3f8b9d298d9b82d01109ca682b0b7159 100644 (file)
--- a/prj.org
+++ b/prj.org
@@ -12,7 +12,7 @@
     - [X] code
     - [X] appimage
     - [X] windows
-    - [ ] flatpak
+    - [X] flatpak
     - [ ] itchio
     - [ ] versions
 ** READY management of error and success (upload builds, itch.io)

diff --git a/setup.py b/setup.py
index 6f5aeaded25fc16549b9d4d11f39f7229da52db4..0984091f5934ff8fdeb65414b98172b898823494 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -129,7 +129,7 @@ class BDistAppsCmd(bdist_apps):
         if not self.nolinux:
             hbranch = {'master': 'alpha', 'rc': 'rc', 'stable': ''}[branch]
             AppImageBuilder(self).build(longname, hbranch,
-                                        'http://www.ya2tech.it/downloads/')
+                                        'https://www.ya2.it/downloads/')
             fbranch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[branch]
             bld = FlatpakBuilder(
                 self,

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')