From 9f49187dc1ee579a9bd5777b8d706645da3d84e9 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 31 Aug 2020 20:32:24 +0200 Subject: [PATCH] Fix tests and xenial build --- libnymea-core/integrations/pythonintegrationplugin.cpp | 2 +- tests/auto/integrations/testintegrations.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libnymea-core/integrations/pythonintegrationplugin.cpp b/libnymea-core/integrations/pythonintegrationplugin.cpp index dae5f754..3891a84a 100644 --- a/libnymea-core/integrations/pythonintegrationplugin.cpp +++ b/libnymea-core/integrations/pythonintegrationplugin.cpp @@ -245,7 +245,7 @@ void PythonIntegrationPlugin::deinitPython() PyEval_RestoreThread(s_mainThreadState); // Tear down the python engine - Py_FinalizeEx(); + Py_Finalize(); // Our main thread state is destroyed now s_mainThreadState = nullptr; diff --git a/tests/auto/integrations/testintegrations.cpp b/tests/auto/integrations/testintegrations.cpp index 5b5d8039..bfacf23b 100644 --- a/tests/auto/integrations/testintegrations.cpp +++ b/tests/auto/integrations/testintegrations.cpp @@ -291,8 +291,8 @@ void TestIntegrations::getThingClasses_data() QTest::addColumn("vendorId"); QTest::addColumn("resultCount"); - QTest::newRow("vendor nymea") << nymeaVendorId << 14; - QTest::newRow("no filter") << VendorId() << 14; + QTest::newRow("vendor nymea") << nymeaVendorId << 17; + QTest::newRow("no filter") << VendorId() << 17; QTest::newRow("invalid vendor") << VendorId("93e7d361-8025-4354-b17e-b68406c800bc") << 0; }