Fixed threading issue in Biosphere patcher (#1200)

* Fix threading issue in Biosphere patcher

* Updated tests to wait for patching to complete

* Update test for more explicit difference between installing and patching biosphere

---------

Co-authored-by: marc-vdm <2yko3fodzd@posteo.net>

Author: mrvisscher

activity_browser/ui/widgets/dialog.py

@@ -524,7 +524,7 @@ def __init__(self, version, parent=None):
         self.biosphere_thread.start()
 
         # finally, check if patches are available for this version and apply them
-        self.check_patches()
+        #self.biosphere_thread.finished.connect(self.check_patches)
 
     @Slot(int, str, name='updateThread')
     def update_progress(self, current: int, text: str) -> None:
@@ -534,6 +534,7 @@ def update_progress(self, current: int, text: str) -> None:
     def finished(self, result: int = None) -> None:
         self.biosphere_thread.exit(result or 0)
         self.setValue(3)
+        self.check_patches()
         signals.change_project.emit(bw.projects.current)
         signals.project_selected.emit()
 

tests/test_add_default_data.py

@@ -35,6 +35,10 @@ def test_add_default_data(qtbot, ab_app, monkeypatch):
             QtCore.Qt.LeftButton
         )
 
+    # The biosphere3 update finishes with a 'database_changed' signal.
+    with qtbot.waitSignal(signals.database_changed, timeout=2 * 60 * 1000):  # allow 2 mins for biosphere update
+        pass
+
     # biosphere was installed
     assert 'biosphere3' in bw.databases