Skip to content
Snippets Groups Projects
Verified Commit 99860939 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'dev' into f-fix-async-timeout

parents 96856cde d17869cf
No related branches found
No related tags found
1 merge request!29fix async timeout
Pipeline #41853 passed
...@@ -15,7 +15,8 @@ RUN rm -rf .git ...@@ -15,7 +15,8 @@ RUN rm -rf .git
COPY .docker/caosdb-client.json /caosdb-client.json COPY .docker/caosdb-client.json /caosdb-client.json
# build and run tests # Build and run tests.
# If no other command is given to the Docker image
CMD mkdir build && \ CMD mkdir build && \
cd build && \ cd build && \
conan install .. -s "compiler.libcxx=libstdc++11" && \ conan install .. -s "compiler.libcxx=libstdc++11" && \
......
...@@ -78,16 +78,12 @@ build-testenv: &build-testenv ...@@ -78,16 +78,12 @@ build-testenv: &build-testenv
stage: setup stage: setup
timeout: 2h timeout: 2h
needs: [] needs: []
only:
- pipelines
- schedules
- web
script: script:
- *env - *env
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
#build testenv image #build testenv image
- docker pull $CPPLIB_REGISTRY_IMAGE || { CPPLIB_REGISTRY_IMAGE="$CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:dev" ; docker pull $CPPLIB_REGISTRY_IMAGE ; } - docker pull $CPPLIB_REGISTRY_IMAGE || { CPPLIB_REGISTRY_IMAGE="$CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv:dev" ; echo "Using cpplib@dev instead."; docker pull $CPPLIB_REGISTRY_IMAGE ; }
- docker build - docker build
--build-arg CPPLIB_REGISTRY_IMAGE=$CPPLIB_REGISTRY_IMAGE --build-arg CPPLIB_REGISTRY_IMAGE=$CPPLIB_REGISTRY_IMAGE
--file .docker/Dockerfile --file .docker/Dockerfile
......
...@@ -1342,11 +1342,9 @@ TEST_F(test_transaction, test_delete_string_id) { ...@@ -1342,11 +1342,9 @@ TEST_F(test_transaction, test_delete_string_id) {
EXPECT_TRUE(transaction->GetStatus().IsTerminated()); EXPECT_TRUE(transaction->GetStatus().IsTerminated());
EXPECT_TRUE(transaction->GetStatus().IsError()); EXPECT_TRUE(transaction->GetStatus().IsError());
const auto &results = transaction->GetResultSet(); const auto &results = transaction->GetResultSet();
EXPECT_FALSE(results.at(0).HasErrors());
EXPECT_TRUE(results.at(1).HasErrors()); EXPECT_TRUE(results.at(1).HasErrors());
EXPECT_EQ(results.at(1).GetErrors().size(), 1); EXPECT_EQ(results.at(1).GetErrors().size(), 1);
EXPECT_EQ(results.at(1).GetErrors().at(0).GetDescription(), "Entity does not exist."); EXPECT_EQ(results.at(1).GetErrors().at(0).GetDescription(), "Entity does not exist.");
EXPECT_FALSE(results.at(2).HasErrors());
} }
} // namespace caosdb::transaction } // namespace caosdb::transaction
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment