From 5b3aab52c4f6f3e5eecb5509793ef40bf008a71a Mon Sep 17 00:00:00 2001 From: O B Date: Sat, 9 Mar 2024 12:51:08 -0800 Subject: [PATCH 1/2] added duration_cast in AgentConfiguration::monitorFiles() for "... Waiting" message --- src/mtconnect/configuration/agent_config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mtconnect/configuration/agent_config.cpp b/src/mtconnect/configuration/agent_config.cpp index 6d2ff7ba8..153ff6f5d 100644 --- a/src/mtconnect/configuration/agent_config.cpp +++ b/src/mtconnect/configuration/agent_config.cpp @@ -315,7 +315,7 @@ namespace mtconnect::configuration { LOG(warning) << "... File changed at: " << put_time(localtime(&t), "%F %T"); } - auto delta = min(now - cfgTime, now - devTime); + auto delta = duration_cast(min(now - cfgTime, now - devTime)); if (delta < m_monitorDelay) { LOG(warning) << "... Waiting " << int32_t((m_monitorDelay - delta).count()) << " seconds"; From 927c8a68904e8e80f78e9c85ab9a92c82af22477 Mon Sep 17 00:00:00 2001 From: O B Date: Sat, 9 Mar 2024 14:33:28 -0800 Subject: [PATCH 2/2] added deltaMS = duration_cast(delta) to TEST_F(AgentTest, should_stream_data_with_interval) for EXPECT_GT(slop, deltaMS) --- test_package/agent_test.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test_package/agent_test.cpp b/test_package/agent_test.cpp index ea6326096..3c66f90b9 100644 --- a/test_package/agent_test.cpp +++ b/test_package/agent_test.cpp @@ -2680,7 +2680,8 @@ TEST_F(AgentTest, should_stream_data_with_interval) ASSERT_FALSE(m_agentTestHelper->m_session->m_chunkBody.empty()); PARSE_XML_CHUNK(); - EXPECT_GT(slop, delta) << "delta " << delta.count() << " < delay " << slop.count(); + auto deltaMS = duration_cast(delta); + EXPECT_GT(slop, deltaMS) << "delta " << deltaMS.count() << " < delay " << slop.count(); } }