Merge remote-tracking branch 'origin/master' into black

tests/test_directory_tree_plugin.py

@@ -90,14 +90,6 @@ def get_project_names():
     assert get_project_names() == ['c', 'a']
 
 
-@pytest.fixture
-def dont_run_in_thread(monkeypatch):
-    def func(blocking_function, done_callback, check_interval_ms=69):
-        done_callback(True, blocking_function())
-
-    monkeypatch.setattr(utils, 'run_in_thread', func)
-
-
 @pytest.mark.skipif(shutil.which('git') is None, reason="git not found")
 def test_added_and_modified_content(tree, tmp_path, monkeypatch, dont_run_in_thread):
     monkeypatch.chdir(tmp_path)

tests/test_mergeconflict_plugin.py

@@ -21,9 +21,6 @@
 
 
 @pytest.mark.skipif(shutil.which('git') is None, reason="need git to make merge conflicts")
-@pytest.mark.skipif(
-    os.getenv('GITHUB_ACTIONS') == 'true', reason="somehow doesn't work in gh actions"
-)
 def test_merge_conflict_string(tmp_path, monkeypatch, capfd):
     monkeypatch.chdir(tmp_path)
     file_content = 'before\nhello\nafter\n'
@@ -44,7 +41,7 @@ def test_merge_conflict_string(tmp_path, monkeypatch, capfd):
     subprocess.run(['git', 'commit', '--all', '-m', 'hello my friend'])
     subprocess.run(['git', 'merge', 'other_branch'])
     assert pathlib.Path('foo.txt').read_text() == merge_conflict_string
-    capfd.readouterr()  # prevents unnecessary prints from git
+    capfd.readouterr()   # hide unnecessary prints from git
 
 
 def test_find_merge_conflicts(filetab):

tests/test_pastebin_plugin.py

@@ -135,10 +135,7 @@ def fake_wait_window(success_dialog):
         assert thread_done and fake_wait_window_done
 
 
-@pytest.mark.skipif(
-    os.getenv('GITHUB_ACTIONS') == 'true', reason="somehow doesn't work with gh actions"
-)
-def test_paste_error_handling(monkeypatch, caplog, mocker, tabmanager, filetab):
+def test_paste_error_handling(monkeypatch, caplog, mocker, tabmanager, filetab, dont_run_in_thread):
     monkeypatch.setattr(pastebin_module, 'DPASTE_URL', 'ThisIsNotValidUrlStart://wat')
     mocker.patch('porcupine.utils.errordialog')