From 7c16f5e9b7247ca2771f46afdef684559b6da72e Mon Sep 17 00:00:00 2001 From: Nikita Poltorapavlo Date: Fri, 12 Apr 2024 17:34:25 +0300 Subject: [PATCH 1/2] ES1-1055 : Increase spawn process timeout Reason for change: Increase timeout from 2s to RPC::CommunicationTimeOut (3s default, 20s in RDK). Test Procedure: None Risks: None Signed-off-by: Nikita Poltorapavlo --- PersistentStore/PersistentStore.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PersistentStore/PersistentStore.cpp b/PersistentStore/PersistentStore.cpp index caf8a730ed..cfce5e185c 100644 --- a/PersistentStore/PersistentStore.cpp +++ b/PersistentStore/PersistentStore.cpp @@ -93,7 +93,7 @@ namespace Plugin { uint32_t connectionId; - _deviceStore2 = service->Root(connectionId, 2000, _T("SqliteStore2")); + _deviceStore2 = service->Root(connectionId, RPC::CommunicationTimeOut, _T("SqliteStore2")); if (_deviceStore2 != nullptr) { _deviceStore2->Register(&_store2Sink); _deviceStore2->Register(_store); @@ -102,7 +102,7 @@ namespace Plugin { _deviceStoreLimit = _deviceStore2->QueryInterface(); } - _accountStore2 = service->Root(connectionId, 2000, _T("GrpcStore2")); + _accountStore2 = service->Root(connectionId, RPC::CommunicationTimeOut, _T("GrpcStore2")); if (_accountStore2 != nullptr) { _accountStore2->Register(&_store2Sink); } From dfb7fedeffa279182d5a51c082a500cb9172db4a Mon Sep 17 00:00:00 2001 From: Nikita Poltorapavlo Date: Tue, 9 Apr 2024 17:19:02 +0300 Subject: [PATCH 2/2] adapt ServiceMock to the recent changes in Thunder IShell interface --- PersistentStore/l0test/ServiceMock.h | 1 + PersistentStore/l1test/ServiceMock.h | 1 + 2 files changed, 2 insertions(+) diff --git a/PersistentStore/l0test/ServiceMock.h b/PersistentStore/l0test/ServiceMock.h index f18d2c9c29..36c5c3c43d 100644 --- a/PersistentStore/l0test/ServiceMock.h +++ b/PersistentStore/l0test/ServiceMock.h @@ -23,6 +23,7 @@ class ServiceMock : public WPEFramework::PluginHost::IShell { MOCK_METHOD(WPEFramework::PluginHost::ISubSystem*, SubSystems, (), (override)); MOCK_METHOD(uint32_t, Submit, (const uint32_t, const WPEFramework::Core::ProxyType&), (override)); MOCK_METHOD(void, Notify, (const string&), (override)); + MOCK_METHOD(void, Notify, (const string&, const string&), (override)); MOCK_METHOD(void*, QueryInterfaceByCallsign, (const uint32_t, const string&), (override)); MOCK_METHOD(void, Register, (WPEFramework::PluginHost::IPlugin::INotification*), (override)); MOCK_METHOD(void, Unregister, (WPEFramework::PluginHost::IPlugin::INotification*), (override)); diff --git a/PersistentStore/l1test/ServiceMock.h b/PersistentStore/l1test/ServiceMock.h index f18d2c9c29..36c5c3c43d 100644 --- a/PersistentStore/l1test/ServiceMock.h +++ b/PersistentStore/l1test/ServiceMock.h @@ -23,6 +23,7 @@ class ServiceMock : public WPEFramework::PluginHost::IShell { MOCK_METHOD(WPEFramework::PluginHost::ISubSystem*, SubSystems, (), (override)); MOCK_METHOD(uint32_t, Submit, (const uint32_t, const WPEFramework::Core::ProxyType&), (override)); MOCK_METHOD(void, Notify, (const string&), (override)); + MOCK_METHOD(void, Notify, (const string&, const string&), (override)); MOCK_METHOD(void*, QueryInterfaceByCallsign, (const uint32_t, const string&), (override)); MOCK_METHOD(void, Register, (WPEFramework::PluginHost::IPlugin::INotification*), (override)); MOCK_METHOD(void, Unregister, (WPEFramework::PluginHost::IPlugin::INotification*), (override));