diff --git a/utest/editor/test_texteditor.py b/utest/editor/test_texteditor.py index fac1e1f24..bb6b0e76f 100644 --- a/utest/editor/test_texteditor.py +++ b/utest/editor/test_texteditor.py @@ -174,6 +174,7 @@ def tearDown(self): # wx.CallAfter(wx.Exit) self.shared_mem.shm.close() self.shared_mem.shm.unlink() + self.app.ExitMainLoop() self.app.Destroy() self.app = None @@ -659,6 +660,7 @@ def tearDown(self): # wx.CallAfter(wx.Exit) self.shared_mem.shm.close() self.shared_mem.shm.unlink() + self.app.ExitMainLoop() self.app.Destroy() self.app = None diff --git a/utest/logs/test_log_windows.py b/utest/logs/test_log_windows.py index 0b45a3763..7374ad03f 100644 --- a/utest/logs/test_log_windows.py +++ b/utest/logs/test_log_windows.py @@ -61,6 +61,10 @@ def my_show(*args): self._panel.SetSize(200, 400) self._panel.close(note) + myapp.ExitMainLoop() + myapp.Destroy() + myapp = None + def test_message_log(self): result = message_to_string(log[0]) assert result.strip() == '20230604 20:40:41.415 [INFO]: Found Robot Framework version 6.0.2 from path' diff --git a/utest/resources/fake.cfg b/utest/resources/fake.cfg deleted file mode 100644 index 775b0e521..000000000 --- a/utest/resources/fake.cfg +++ /dev/null @@ -1,21 +0,0 @@ - -auto imports = [] -pythonpath = [] -global_settings = [] -doc language = '' -library xml directories = [] -reformat = False -txt number of spaces = 2 -[General] -font size = 10 -font face = 'Source Code Pro' -foreground = '#8FF0A4' -background = '#A51D2D' -secondary foreground = '#FFFF00' -secondary background = '#4A060B' -background help = '#FFBE6F' -foreground text = '#613583' -apply to panels = True -ui language = 'English' -[Plugins] -[[Text Editor]] diff --git a/utest/run/test_process.py b/utest/run/test_process.py index 730a832f7..e033b717f 100644 --- a/utest/run/test_process.py +++ b/utest/run/test_process.py @@ -33,7 +33,7 @@ def test_command_as_string(self): assert len(processed_command) == len(initial_command.split()) assert processed_command[4] == 'a2 2 1' - @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS'), reason="Fails at Fedora workflow") + @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS')=='true', reason="Fails at Fedora workflow") def test_writing_to_stderr(self): self.proc = self._create_process('python %s stderr' % SCRIPT) eol = '\r\n' if IS_WINDOWS else '\n' diff --git a/utest/run/test_run_anything.py b/utest/run/test_run_anything.py index e96680d4e..20d87f3b0 100644 --- a/utest/run/test_run_anything.py +++ b/utest/run/test_run_anything.py @@ -55,14 +55,14 @@ def update_output(self, output, finished): class TestRunAnything(UIUnitTestBase): - @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS'), reason="Fails at Fedora workflow") + @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS')=='true', reason="Fails at Fedora workflow") def test_run(self): self.runner = self._create_runner('python %s count_args a b c' % SCRIPT) self._wait_until_finished() assert self.runner.finished assert self.runner.outstr == '3\n' - @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS'), reason="Fails at Fedora workflow") + @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS')=='true', reason="Fails at Fedora workflow") def test_stopping(self): self.runner = self._create_runner('python %s output 0.8' % SCRIPT) time.sleep(0.3) @@ -77,7 +77,7 @@ def test_error(self): assert self.runner.finished assert self.runner.outstr - @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS'), reason="Fails at Fedora workflow") + @pytest.mark.skipif(os.getenv('GITHUB_ACTIONS')=='true', reason="Fails at Fedora workflow") def test_stderr(self): self.runner = self._create_runner('python %s stderr' % SCRIPT) self._wait_until_finished() diff --git a/utest/run/test_ui_elements.py b/utest/run/test_ui_elements.py index 156ce7361..a32b67b97 100644 --- a/utest/run/test_ui_elements.py +++ b/utest/run/test_ui_elements.py @@ -86,6 +86,7 @@ def setUp(self): def tearDown(self): PUBLISHER.unsubscribe_all() # wx.CallAfter(self.app.ExitMainLoop) + self.app.ExitMainLoop() self.app.Destroy() self.app = None diff --git a/utest/ui/test_contextdialogs.py b/utest/ui/test_contextdialogs.py index 9706feac0..15c238561 100644 --- a/utest/ui/test_contextdialogs.py +++ b/utest/ui/test_contextdialogs.py @@ -87,7 +87,7 @@ def setUp(self): def tearDown(self): PUBLISHER.unsubscribe_all() - wx.CallAfter(self.app.ExitMainLoop) + self.app.ExitMainLoop() self.app.Destroy() self.app = None # app.MainLoop() # With this here, there is no Segmentation fault diff --git a/utest/ui/test_tree.py b/utest/ui/test_tree.py index aedff7bbe..003cce562 100644 --- a/utest/ui/test_tree.py +++ b/utest/ui/test_tree.py @@ -91,8 +91,10 @@ def setUp(self): def tearDown(self): PUBLISHER.unsubscribe_all() - wx.CallAfter(self.frame.Close) - wx.CallAfter(self.app.ExitMainLoop) + # wx.CallAfter(self.frame.Close) + # wx.CallAfter(self.app.ExitMainLoop) + self.app.ExitMainLoop() + self.app.Destroy() # self.app.MainLoop() # With this here, there is no Segmentation fault self.app = None