You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sz...@apache.org on 2022/08/23 19:09:56 UTC
[nifi-minifi-cpp] branch main updated (519f80b2d -> 3d66a3655)
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
from 519f80b2d MINIFICPP-1913 Fix ConsumeKafka SSL tests with newer OpenSSL versions
new ed27bf41c MINIFICPP-1918 Fix windows build
new daf3aa8b3 MINIFICPP-1906 Restore original timeout for CivetServer
new 3d66a3655 MINIFICPP-1919 centos HTTPClientTests fix
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cmake/CivetWeb.cmake | 1 +
docker/centos/Dockerfile | 2 +-
extensions/script/tests/PythonManifestTests.cpp | 4 ++--
libminifi/test/flow-tests/TestControllerWithFlow.h | 6 +++---
4 files changed, 7 insertions(+), 6 deletions(-)
[nifi-minifi-cpp] 02/03: MINIFICPP-1906 Restore original timeout for CivetServer
Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit daf3aa8b35bb68af0edcab1517c4715bdea2bc31
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Tue Aug 23 21:06:20 2022 +0200
MINIFICPP-1906 Restore original timeout for CivetServer
There was a change in CivetWeb (commit hash: a7361235) where a
previously used poll function with constant timeout of 200 ms was
replaced with the mg_poll function. This function uses the
SOCKET_TIMEOUT_QUANTUM constant for the timeout value of a single poll
call. The default value of this constant is 2000 ms and due to this the
shutdown of the CivetServer had to wait 10 times more for the ongoing
poll to finish in every single test case, which increased the runtime of
the test cases. The SOCKET_TIMEOUT_QUANTUM is changed back to 200 ms in
this PR.
Closes #1403
Signed-off-by: Marton Szasz <sz...@apache.org>
---
cmake/CivetWeb.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmake/CivetWeb.cmake b/cmake/CivetWeb.cmake
index dc7cc4b19..effc81564 100644
--- a/cmake/CivetWeb.cmake
+++ b/cmake/CivetWeb.cmake
@@ -35,6 +35,7 @@ FetchContent_MakeAvailable(civetweb)
add_dependencies(civetweb-c-library OpenSSL::Crypto OpenSSL::SSL)
add_dependencies(civetweb-cpp OpenSSL::Crypto OpenSSL::SSL)
+target_compile_definitions(civetweb-c-library PRIVATE SOCKET_TIMEOUT_QUANTUM=200)
if (NOT WIN32)
target_compile_options(civetweb-c-library PRIVATE -Wno-error)
target_compile_options(civetweb-cpp PRIVATE -Wno-error)
[nifi-minifi-cpp] 03/03: MINIFICPP-1919 centos HTTPClientTests fix
Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 3d66a36556be6e7c8ffb59aadd6ad6af5a402e2e
Author: Martin Zink <ma...@apache.org>
AuthorDate: Tue Aug 23 21:07:34 2022 +0200
MINIFICPP-1919 centos HTTPClientTests fix
Closes #1402
Signed-off-by: Marton Szasz <sz...@apache.org>
---
docker/centos/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index 830857323..b98ea0352 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -38,7 +38,7 @@ ENV USER minificpp
# gpsd-devel is in EPEL
RUN yum -y install epel-release && yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel python36-devel sudo git which maven make libarchive boost-devel lua-devel libusbx-devel libpng-devel \
- gpsd-devel libpcap-devel ccache
+ gpsd-devel libpcap-devel ccache ca-certificates
RUN mkdir -p $MINIFI_BASE_DIR
COPY . ${MINIFI_BASE_DIR}
[nifi-minifi-cpp] 01/03: MINIFICPP-1918 Fix windows build
Posted by sz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit ed27bf41c4cd83fae33cdbfaa8f96003dffac27a
Author: Adam Debreceni <ad...@apache.org>
AuthorDate: Tue Aug 23 21:05:06 2022 +0200
MINIFICPP-1918 Fix windows build
Closes #1401
Signed-off-by: Marton Szasz <sz...@apache.org>
---
extensions/script/tests/PythonManifestTests.cpp | 4 ++--
libminifi/test/flow-tests/TestControllerWithFlow.h | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/extensions/script/tests/PythonManifestTests.cpp b/extensions/script/tests/PythonManifestTests.cpp
index 2103b7b2f..9b0db0237 100644
--- a/extensions/script/tests/PythonManifestTests.cpp
+++ b/extensions/script/tests/PythonManifestTests.cpp
@@ -46,7 +46,7 @@ TEST_CASE("Python processor's description is part of the manifest") {
TestControllerWithFlow controller(empty_flow, false /* DEFER FLOW SETUP */);
auto python_dir = std::filesystem::path(controller.configuration_->getHome()) / "minifi-python";
- utils::file::create_dir(python_dir);
+ utils::file::create_dir(python_dir.string());
std::ofstream{python_dir / "MyPyProc.py"} <<
"def describe(proc):\n"
" proc.setDescription('An amazing processor')\n";
@@ -57,7 +57,7 @@ TEST_CASE("Python processor's description is part of the manifest") {
" proc.setSupportsDynamicProperties()\n"
" proc.addProperty('Prop1', 'A great property', 'banana', True, False)\n";
- controller.configuration_->set(minifi::Configuration::nifi_python_processor_dir, python_dir);
+ controller.configuration_->set(minifi::Configuration::nifi_python_processor_dir, python_dir.string());
controller.configuration_->set(minifi::Configuration::nifi_extension_path, "*minifi-script*");
core::extension::ExtensionManager::get().initialize(controller.configuration_);
diff --git a/libminifi/test/flow-tests/TestControllerWithFlow.h b/libminifi/test/flow-tests/TestControllerWithFlow.h
index b87c76cb0..b834b8374 100644
--- a/libminifi/test/flow-tests/TestControllerWithFlow.h
+++ b/libminifi/test/flow-tests/TestControllerWithFlow.h
@@ -46,8 +46,8 @@ class TestControllerWithFlow: public TestController{
std::ofstream{yaml_path_} << yamlConfigContent;
configuration_ = std::make_shared<minifi::Configure>();
- configuration_->setHome(home_);
- configuration_->set(minifi::Configure::nifi_flow_configuration_file, yaml_path_);
+ configuration_->setHome(home_.string());
+ configuration_->set(minifi::Configure::nifi_flow_configuration_file, yaml_path_.string());
if (setup_flow) {
setupFlow();
@@ -62,7 +62,7 @@ class TestControllerWithFlow: public TestController{
REQUIRE(content_repo->initialize(configuration_));
std::shared_ptr<minifi::io::StreamFactory> stream_factory = minifi::io::StreamFactory::getInstance(configuration_);
- auto flow = std::make_unique<core::YamlConfiguration>(prov_repo, ff_repo, content_repo, stream_factory, configuration_, yaml_path_);
+ auto flow = std::make_unique<core::YamlConfiguration>(prov_repo, ff_repo, content_repo, stream_factory, configuration_, yaml_path_.string());
auto root = flow->getRoot();
root_ = root.get();
controller_ = std::make_shared<minifi::FlowController>(