diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index daedc66c2cd860128702e19d82a50ddea27d591a..f02b6972e4c0baf8b761ec97e6aac2c65350f0e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ variables: # caosdb-cpplib) CPPLIB_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-cpplib/testenv OCTAVE_REGISTRY_IMAGE: $CI_REGISTRY_IMAGE/testenv:$CI_COMMIT_REF_NAME - CPPLIB_BRANCH: v0.0.6 + CPPLIB_BRANCH: dev OCTAVEINTTEST_PIPELINE: https://gitlab.indiscale.com/api/v4/projects/121/trigger/pipeline diff --git a/conanfile.txt b/conanfile.txt index 013b9213e22b751bb8495de192137d6d73c9485e..3dbc815bd6d69bd304b4dba3833ef6c85e13a690 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,5 @@ [requires] -caosdb/0.0.6 +caosdb/0.0.7 [generators] cmake diff --git a/src/Caosdb.m b/src/Caosdb.m index 484759be541f0e8f37e88628e42927fb3f89f782..a94720905d6e188423457373bf895ffdbd5615ff 100644 --- a/src/Caosdb.m +++ b/src/Caosdb.m @@ -63,9 +63,9 @@ classdef Caosdb < handle info_result = maox_info(obj.connection); res = info_result; catch - disp("some error!"); - disp(lasterror()); - res = NA; + % disp("some error!"); + % disp(lasterror()); + rethrow(lasterror()); end end diff --git a/test/Run_Test.m b/test/Run_Test.m index e097828f4312afcdae669ced34b6e2f79282a88b..e72e71a9cbc169647ccd1de253d9c7f178d89be9 100644 --- a/test/Run_Test.m +++ b/test/Run_Test.m @@ -17,7 +17,7 @@ % along with this program. If not, see <https://www.gnu.org/licenses/>. pkg load caosdb; -test_result = moxunit_runtests("-verbose", "test_caosdb.m"); +test_result = moxunit_runtests("-verbose", "test_unittest.m"); if not(test_result) exit(1) end diff --git a/test/test_unittest.m b/test/test_unittest.m index d8d9de1b08664d5a28ed0e8799751b8603e543d4..4d036d210f38f8831d28ddfea8284bb542e8c572 100644 --- a/test/test_unittest.m +++ b/test/test_unittest.m @@ -35,5 +35,5 @@ function test_local() % Only get the local versions. version = caosdb_exec("--version"); - assertEqual(version, "v0.1 (libcaosdb v0.0.6)"); + assertEqual(version, "v0.1 (libcaosdb v0.0.7)"); end