From 3dbdec0f8a6eca7b4b6e246292a53be9e76a0993 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Thu, 5 Aug 2021 10:11:38 +0200
Subject: [PATCH] FIX: Failing Octave test returns a failure now.
Also updated cpplib dependency to 0.0.7.
---
.gitlab-ci.yml | 2 +-
conanfile.txt | 2 +-
src/Caosdb.m | 6 +++---
test/Run_Test.m | 2 +-
test/test_unittest.m | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index daedc66..f02b697 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 013b921..3dbc815 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 484759b..a947209 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 e097828..e72e71a 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 d8d9de1..4d036d2 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
--
GitLab