external testing process

[pmachines.git] / tests / test_functional.py

diff --git a/tests/test_functional.py b/tests/test_functional.py
index 2971f05e97545607e96a167b6229e555c15eab3a..3db67e030b30615c7946ffcaffa33a7169a22ad4 100644 (file)
--- a/tests/test_functional.py
+++ b/tests/test_functional.py
@@ -89,8 +89,10 @@ class FunctionalTests(TestCase):
     def test_code(self):
         info('test_code')
         self.__test_template(
-            '~/venv/bin/python main.py --functional-test 1 ; '
-            '~/venv/bin/python main.py --functional-test 2',
+            'timeout 720s ~/venv/bin/python main.py --functional-test & '
+            'timeout 720s ~/venv/bin/python -m lib.tools.functional_test.py 1; sleep 5; '
+            'timeout 720s ~/venv/bin/python main.py --functional-test & '
+            'timeout 720s ~/venv/bin/python -m lib.tools.functional_test.py 2',
             str(Path.home()) + '/.local/share/pmachines/tests/functional/')
 
     def test_appimage(self):
@@ -98,8 +100,10 @@ class FunctionalTests(TestCase):
         bld_branch = {'master': 'alpha', 'rc': 'rc', 'stable': 'stable'}[_branch()]
         bld_branch = '' if bld_branch == 'stable' else ('-' + bld_branch)
         self.__test_template(
-            './dist/Pmachines%s-x86_64.AppImage --functional-test 1 ;'
-            './dist/Pmachines%s-x86_64.AppImage --functional-test 2' % (bld_branch, bld_branch),
+            'timeout 720s ./dist/Pmachines%s-x86_64.AppImage --functional-test & '
+            'timeout 720s ~/venv/bin/python -m lib.tools.functional_test.py 1; sleep 5; '
+            'timeout 720s ./dist/Pmachines%s-x86_64.AppImage --functional-test & ' % (bld_branch, bld_branch) +
+            'timeout 720s ~/venv/bin/python -m lib.tools.functional_test.py 2',
             str(Path.home()) + '/.local/share/pmachines/tests/functional/')
 
     def test_flatpak(self):
@@ -112,39 +116,45 @@ class FunctionalTests(TestCase):
         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),
+            'timeout 720s flatpak run it.ya2.Pmachines//%s --functional-test & '
+            'timeout 720s ~/venv/bin/python -m lib.tools.functional_test.py 1; sleep 5; '
+            'timeout 720s flatpak run it.ya2.Pmachines//%s --functional-test & ' % (bld_branch, bld_branch) +
+            'timeout 720s ~/venv/bin/python -m lib.tools.functional_test.py 2',
             str(Path.home()) + '/.var/app/it.ya2.Pmachines/data/pmachines/tests/functional/')
 
-    def __update_itchio(self):
-        system('/home/flavio/.itch/itch')
-        sleep(5)
-        system('xdotool mousemove 860 620')
-        sleep(1)
-        system('xdotool click 1')
-        sleep(300)
-        system('killall itch')
-
-    def test_itchio(self):
-        info('test_itchio')
-        if environ.get('FUNCTIONALPOST') != '1':
-            self.skipTest('skipped functional-post tests')
-        if _branch() != 'master':
-            return
-        self.__update_itchio()
-        self.__test_template(
-            '/home/flavio/.config/itch/apps/pmachines/pmachines --functional-test 1 ;'
-            '/home/flavio/.config/itch/apps/pmachines/pmachines --functional-test 2',
-            str(Path.home()) + '/.local/share/pmachines/tests/functional/')
-
-    def test_windows(self):
-        info('test_windows')
-        system('pkill -f "pmachines.exe"')
-        abspath = str(Path(__file__).parent.parent) + '/build/win_amd64/pmachines.exe'
-        self.__test_template(
-            'timeout 720s wine %s --functional-test 1 ; '
-            'timeout 720s wine %s --functional-test 2' % (abspath, abspath),
-            str(Path.home()) + '/.wine/drive_c/users/flavio/AppData/Local/pmachines/tests/functional/')
+    # def __update_itchio(self):
+    #     system('/home/flavio/.itch/itch')
+    #     sleep(5)
+    #     system('xdotool mousemove 860 620')
+    #     sleep(1)
+    #     system('xdotool click 1')
+    #     sleep(300)
+    #     system('killall itch')
+
+    # def test_itchio(self):
+    #     info('test_itchio')
+    #     if environ.get('FUNCTIONALPOST') != '1':
+    #         self.skipTest('skipped functional-post tests')
+    #     if _branch() != 'master':
+    #         return
+    #     self.__update_itchio()
+    #     self.__test_template(
+    #         'timeout 720s /home/flavio/.config/itch/apps/pmachines/pmachines --functional-test & '
+    #         'timeout 720s ~/venv/bin/python -m lib.tools.functional_test.py 1; sleep 5; '
+    #         'timeout 720s /home/flavio/.config/itch/apps/pmachines/pmachines --functional-test & '
+    #         'timeout 720s ~/venv/bin/python -m lib.tools.functional_test.py 2',
+    #         str(Path.home()) + '/.local/share/pmachines/tests/functional/')
+
+    #def test_windows(self):
+    #    info('test_windows')
+    #    system('pkill -f "pmachines.exe"')
+    #    abspath = str(Path(__file__).parent.parent) + '/build/win_amd64/pmachines.exe'
+    #    self.__test_template(
+    #        'timeout 720s wine %s --functional-test & '
+    #        'timeout 720s ~/venv/bin/python -m lib.tools.functional_test.py 1; sleep 5; '
+    #        'timeout 720s wine %s --functional-test & ' % (abspath, abspath) +
+    #        'timeout 720s ~/venv/bin/python -m lib.tools.functional_test.py 2',
+    #        str(Path.home()) + '/.wine/drive_c/users/flavio/AppData/Local/pmachines/tests/functional/')
 
     def test_versions(self):
         info('test_versions')
@@ -162,15 +172,15 @@ class FunctionalTests(TestCase):
                 _ver = fver.read().strip() + '-'
         exp = '%s-%s' % (_ver, commit)
         cmds = [
-            ('./build/manylinux1_x86_64/pmachines --version', str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt'),
-            ('./dist/Pmachines-%s-x86_64.AppImage --version' % bld_branch, str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt'),
-            ('timeout 720s wine ./build/win_amd64/pmachines.exe --version', '/home/flavio/.wine/drive_c/users/flavio/AppData/Local/pmachines/obs_version.txt')
+            ('timeout 720s ./build/manylinux2010_x86_64/pmachines --version', str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt'),
+            ('timeout 720s ./dist/Pmachines-%s-x86_64.AppImage --version' % bld_branch, str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt'),
+            #('timeout 720s wine ./build/win_amd64/pmachines.exe --version', '/home/flavio/.wine/drive_c/users/flavio/AppData/Local/pmachines/obs_version.txt')
             ]
-        if environ.get('FUNCTIONALPOST') == '1':
-            if _branch() == 'master':
-                self.__update_itchio()
-                cmds += [('/home/flavio/.config/itch/apps/pmachines/pmachines --version', str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt')]
-            cmds += [('flatpak run it.ya2.Pmachines//%s --version' % bld_branch, '/home/flavio/.var/app/it.ya2.Pmachines/data/pmachines/obs_version.txt')]
+        #if environ.get('FUNCTIONALPOST') == '1':
+        #    if _branch() == 'master':
+        #        self.__update_itchio()
+        #        cmds += [('timeout 720s /home/flavio/.config/itch/apps/pmachines/pmachines --version', str(Filename.get_user_appdata_directory()) + '/pmachines/obs_version.txt')]
+        #    cmds += [('timeout 720s flatpak run it.ya2.Pmachines//%s --version' % bld_branch, '/home/flavio/.var/app/it.ya2.Pmachines/data/pmachines/obs_version.txt')]
         system('flatpak update -y it.ya2.Pmachines//%s' % bld_branch)
         for cmd in cmds:
             if exists(cmd[1]):