From bc3b018935d2c3b504b0c880eebd3cf047f441f2 Mon Sep 17 00:00:00 2001
From: "Benjamin Jakimow benjamin.jakimow@geo.hu-berlin.de"
<benjamin.jakimow@geo.hu-berlin.de>
Date: Wed, 22 Jan 2020 13:46:06 +0100
Subject: [PATCH] updated qps test_main.py: fixed deprecation warning
Signed-off-by: Benjamin Jakimow benjamin.jakimow@geo.hu-berlin.de <benjamin.jakimow@geo.hu-berlin.de>
---
eotimeseriesviewer/externals/qps/testing.py | 5 -----
eotimeseriesviewer/timeseries.py | 2 +-
tests/test_main.py | 2 +-
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/eotimeseriesviewer/externals/qps/testing.py b/eotimeseriesviewer/externals/qps/testing.py
index 634accab..baa39cb3 100644
--- a/eotimeseriesviewer/externals/qps/testing.py
+++ b/eotimeseriesviewer/externals/qps/testing.py
@@ -192,11 +192,6 @@ def initQgisApplication(*args, qgisResourceDir: str = None,
elif QOperatingSystemVersion.current().type() == QOperatingSystemVersion.Unknown:
qgsApp = qgis.testing.start_app()
- if not QgsProviderRegistry.instance().libraryDirectory().exists():
- for path in QApplication.instance().libraryPaths():
- if os.path.isdir(path):
- QgsProviderRegistry.instance().setLibraryDirectory(QDir(path))
- break
if not QgsProviderRegistry.instance().libraryDirectory().exists():
qdir = QDir(r'/usr/lib/qgis/plugins')
diff --git a/eotimeseriesviewer/timeseries.py b/eotimeseriesviewer/timeseries.py
index f5b8e352..e7d56072 100644
--- a/eotimeseriesviewer/timeseries.py
+++ b/eotimeseriesviewer/timeseries.py
@@ -1181,7 +1181,7 @@ def doLoadTimeSeriesSourcesTask(qgsTask:QgsTask, dump):
except Exception as ex:
invalidSources.append((source, ex))
- qgsTask.setProgress(i + 1)
+ qgsTask.setProgress(int(i + 1))
return pickle.dumps(results), pickle.dumps(invalidSources)
diff --git a/tests/test_main.py b/tests/test_main.py
index 5725854c..43e1cacd 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -104,7 +104,7 @@ class TestInit(TestCase):
TSV.createMapView('Near Infrared')
TSV.loadExampleTimeSeries()
while QgsApplication.taskManager().countActiveTasks() > 0 or len(TSV.timeSeries().mTasks) > 0:
- QCoreApplication.processEvents()
+ QCoreApplication.processEvents(QEventLoop.AllEvents)
if len(TSV.timeSeries()) > 0:
tsd = TSV.timeSeries()[-1]
--
GitLab