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

.docker/Dockerfile

@@ -15,7 +15,8 @@ RUN rm -rf .git
 
 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 && \
     cd build && \
     conan install .. -s "compiler.libcxx=libstdc++11" && \

.gitlab-ci.yml

@@ -78,16 +78,12 @@ build-testenv: &build-testenv
   stage: setup
   timeout: 2h
   needs: []
-  only:
-    - pipelines
-    - schedules
-    - web
   script:
     - *env
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
       #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
       --build-arg CPPLIB_REGISTRY_IMAGE=$CPPLIB_REGISTRY_IMAGE
       --file .docker/Dockerfile

test/test_transaction.cpp

@@ -1342,11 +1342,9 @@ TEST_F(test_transaction, test_delete_string_id) {
   EXPECT_TRUE(transaction->GetStatus().IsTerminated());
   EXPECT_TRUE(transaction->GetStatus().IsError());
   const auto &results = transaction->GetResultSet();
-  EXPECT_FALSE(results.at(0).HasErrors());
   EXPECT_TRUE(results.at(1).HasErrors());
   EXPECT_EQ(results.at(1).GetErrors().size(), 1);
   EXPECT_EQ(results.at(1).GetErrors().at(0).GetDescription(), "Entity does not exist.");
-  EXPECT_FALSE(results.at(2).HasErrors());
 }
 
 } // namespace caosdb::transaction