diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b4ad306a5..56a28ccb9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -253,7 +253,7 @@ jobs: ########################################################################## - name: Login-Server | Unit tests run: | - docker run -v ~/coverage:/code/build/coverage -v ~/configs/login_server/Gradido_LoginServer_Test.properties:/code/build/Gradido_LoginServer_Test.properties gradido/login_server:test --entrypoint + docker run -v ~/coverage:/code/build/coverage -v ~/configs/login_server:/code/config gradido/login_server:test cp -r ~/coverage ./coverage ########################################################################## # COVERAGE CHECK BACKEND LOGIN-SERVER #################################### @@ -303,9 +303,9 @@ jobs: ########################################################################## # UNIT TESTS BACKEND COMMUNITY-SERVER ####################################### ########################################################################## - - name: Login-Server | Unit tests + - name: community server | Unit tests run: | - docker run -v ~/coverage:/code/build/coverage gradido/community_server:test " ./vendor/bin/phpunit --coverage-html ./coverage" + docker run -v ~/coverage:/var/www/cakephp/webroot/coverage gradido/community_server:test "./vendor/bin/phpunit --coverage-html ./webroot/coverage" cp -r ~/coverage ./coverage ########################################################################## # COVERAGE CHECK BACKEND COMMUNITY-SERVER #################################### diff --git a/login_server/Dockerfile b/login_server/Dockerfile index 2191dc316..265df24e5 100644 --- a/login_server/Dockerfile +++ b/login_server/Dockerfile @@ -30,13 +30,16 @@ RUN apk add --no-cache bash perl # cd lcov && \ # make install -RUN mkdir build && cd build && \ - cmake -DCMAKE_BUILD_TYPE=Debug .. && \ - make -j$(nproc) Gradido_LoginServer_Test +RUN ls build && ls build/config + +#RUN mkdir build && cd build && \ +# cmake -DCMAKE_BUILD_TYPE=Debug .. && \ +# make -j$(nproc) Gradido_LoginServer_Test #RUN chmod +x build/bin/Gradido_LoginServer_Test -#CMD [ "./build/bin/Gradido_LoginServer" ] + +#CMD [ "./build/bin/Gradido_LoginServer_Test" ] #ENTRYPOINT [ "/usr/bin/make", "-C", "/code/build", "coverage" ] -ENTRYPOINT cd build && make coverage; +#ENTRYPOINT cd build && make coverage; ######################################################################################################### # Build debug diff --git a/login_server/src/cpp/test/main.cpp b/login_server/src/cpp/test/main.cpp index 6b7f55e0f..daac95426 100644 --- a/login_server/src/cpp/test/main.cpp +++ b/login_server/src/cpp/test/main.cpp @@ -41,10 +41,8 @@ int load() { std::clog << "[load]" << std::endl; Poco::AutoPtr test_config(new Poco::Util::LayeredConfiguration); try { - auto cfg = new Poco::Util::PropertyFileConfiguration("Gradido_LoginServer_Test.properties"); - std::clog << "[load] add config start" << std::endl; + auto cfg = new Poco::Util::PropertyFileConfiguration("config/Gradido_LoginServer_Test.properties"); test_config->add(cfg); - std::clog << "[load] after add config" << std::endl; } catch (Poco::Exception& ex) { std::clog @@ -54,19 +52,16 @@ int load() { return -3; } - std::clog << "[load] after loading config" << std::endl; if (!ServerConfig::initServerCrypto(*test_config)) { //printf("[Gradido_LoginServer::%s] error init server crypto\n", __FUNCTION__); printf("[load] error init server crypto"); return -1; } - std::clog << "[load] after init server crypto" << std::endl; if (!ServerConfig::loadMnemonicWordLists()) { printf("[load] error in loadMnemonicWordLists"); return -2; } - std::clog << "[load] after load mnemonic word lists" << std::endl; // start cpu scheduler uint8_t worker_count = Poco::Environment::processorCount(); @@ -86,7 +81,6 @@ int load() { } catch(Poco::Exception& ex) { printf("Poco Exception by connecting to db: %s\n", ex.displayText().data()); } - std::clog << "[Gradido_LoginServer_Test::load] after connecting to db" << std::endl; //printf("try connect php server mysql \n"); //conn->setConnectionsFromConfig(*test_config, CONNECTION_MYSQL_PHP_SERVER);