From 0dd520283eda1b27d0f1f8ca2d66c22ec66c1b2b Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Thu, 31 Oct 2024 14:16:54 +0100
Subject: [PATCH] TST: Fix profile and config settings
---
.gitignore | 1 +
README.md | 2 +-
pylinkahead.ini.template | 28 +++++++++++++++-------------
test_profile/profile.yml | 3 ++-
4 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore
index 01965dd..99735f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ PyCaosDB*.egg
# user config
pycaosdb.ini
pylinkahead.ini
+*~
diff --git a/README.md b/README.md
index 5c892cc..6027903 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ use for this. Instructions can be found in the official LinkAhead
- The Linkahead server must have debugging enabled.
- The database should be empty.
- The `resources` directory should be made visible, e.g., by
- symlinking or copying its contents. to the server in
+ symlinking or copying its contents, to the server in
`scripting/bin-debug`.
- Modify `pylinkahead.ini.template` and save it as `pylinkahead.ini`, taking care of the following points:
- Certificates must be valid and be specified in `pylinkahead.ini`.
diff --git a/pylinkahead.ini.template b/pylinkahead.ini.template
index 7530d6a..b3e8519 100644
--- a/pylinkahead.ini.template
+++ b/pylinkahead.ini.template
@@ -7,13 +7,13 @@
## to point to existing directories in which the CaosDB server has the
## permissions to create and execute scripts.
-# Location of the scripting bin dir which is used for the test scripts from the
-# pyinttest's perspective. Probably the scripting/bin dir in the caosdb-server sources.
-#test_server_side_scripting.bin_dir.local=/path/to/scripting/bin
+# Location of the scripting bin debug dir which is used for the test
+# scripts from the pyinttest's perspective.
+test_server_side_scripting.bin_dir.local=/path/to/linkahead-pyinttests/resources
-# Location of the scripting bin dir which is used for the test scripts from the
-# server's perspective.
-#test_server_side_scripting.bin_dir.server=/opt/caosdb/git/caosdb-server/scripting/bin
+# Location of the scripting bin debug dir which is used for the test
+# scripts from the server's perspective.
+test_server_side_scripting.bin_dir.server=/opt/caosdb/git/caosdb-server/scripting/bin-debug
########## Files paths ##################
## Used by tests of file handling. Specify the path to an existing
@@ -22,11 +22,11 @@
# Location of the files from the pyinttest (i.e. host) perspective. Probably the local extroot
# path plus `/test_insert_files_in_dir/`.
-#test_files.test_insert_files_in_dir.local=/extroot/test_insert_files_in_dir/
+test_files.test_insert_files_in_dir.local=/path/to/linkahead-pyinttests/test_profile/paths/extroot/test_insert_files_in_dir/
# Location of the files from the caosdb server's perspective. Probably with the same last
# component(s) as the local variant (above).
-#test_files.test_insert_files_in_dir.server=/opt/caosdb/mnt/extroot/test_insert_files_in_dir/
+test_files.test_insert_files_in_dir.server=/opt/caosdb/mnt/extroot/test_insert_files_in_dir/
########## Authentication tokens ##################
# # location of the one-time tokens from the pyinttest's perspective
@@ -34,19 +34,21 @@
# test_authentication.admin_token_expired = /authtoken/admin_token_expired.txt
# test_authentication.admin_token_3_attempts = /authtoken/admin_token_3_attempts.txt
+# Needed for one time-zone test
+test_misc.test_time_zone.time_zone = Cuba
## Insert your usual settings here
[Connection]
-#url=https://caosdb-server:10443/
+url=https://localhost:10443/
## Some integration tests will fail without valid credentials.
-#username=admin
-#password_method=plain
-#password=caosdb
+username=admin
+password_method=plain
+password=caosdb
## Provide SSL certificate used by the CaosDB server for all tests to
## run. Some integration tests will fail without a valid certificate here.
-#cacert=/path/to/cert.pem
+cacert=/path/to/cert.pem
#debug=0
#ssl_insecure=True
diff --git a/test_profile/profile.yml b/test_profile/profile.yml
index 6c0e62a..1bb66d3 100644
--- a/test_profile/profile.yml
+++ b/test_profile/profile.yml
@@ -45,7 +45,7 @@ default:
# name, which is necessary for running multiple instances
# container_name: "linkahead"
# The time zone for the server
- # timezone: "Coordinated Universal Time"
+ timezone: "Cuba"
# Network settings.
network:
@@ -92,6 +92,7 @@ default:
# tests using this key are allowed to, e.g., clear the
# database.
_CAOSDB_INTEGRATION_TEST_SUITE_KEY: "_CAOSDB_PYINTTEST_SUITE"
+ TRANSACTION_BENCHMARK_ENABLED: "TRUE"
# HTTPS port of the grpc end-point
# grpc_server_port_https: 8443
--
GitLab