diff --git a/.gitignore b/.gitignore index 99735f74db5c6b8fc6c6a2b6b562655297901a40..5d0b87b4f66ad72905acd79da9df5d3f428738e7 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ PyCaosDB*.egg pycaosdb.ini pylinkahead.ini *~ +/test_profile/paths/authtoken/admin_token* diff --git a/pylinkahead.ini.template b/pylinkahead.ini.template index 5770cbea74901ee531401382b8a7479ef954d7a4..439f8c1701206eaf271cd93c87b9e8c8d02e2e6e 100644 --- a/pylinkahead.ini.template +++ b/pylinkahead.ini.template @@ -7,11 +7,6 @@ ## to point to existing directories in which the CaosDB server has the ## permissions to create and execute scripts. -# Location of a temp dir into which the server-side scripts can be -# copied during the SSS tests. This is not needed; the tests will use -# /tmp/... if none is given. -# test_server_side_scripting.bin_dir.local=/path/to/linkahead-pyinttest/sss-temp/ - # 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 @@ -30,10 +25,12 @@ test_files.test_insert_files_in_dir.local=/path/to/linkahead-pyinttest/test_prof 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 -# test_authentication.admin_token_crud = /authtoken/admin_token_crud.txt -# test_authentication.admin_token_expired = /authtoken/admin_token_expired.txt -# test_authentication.admin_token_3_attempts = /authtoken/admin_token_3_attempts.txt +# location of the one-time tokens from the pyinttest's +# perspective. When using the test_profile, the parent directory has +# to be the same as the value of `debug_token_auth_dir` +test_authentication.admin_token_crud = /tmp/linkahead-pyinttest/authtoken/admin_token_crud.txt +test_authentication.admin_token_expired = /tmp/linkahead-pyinttest/authtoken/admin_token_expired.txt +test_authentication.admin_token_3_attempts = /tmp/linkahead-pyinttest/authtoken/admin_token_3_attempts.txt # Needed for one time-zone test test_misc.test_time_zone.time_zone = Cuba diff --git a/resources/subdir/.add_dir_to_git b/resources/subdir/.add_dir_to_git new file mode 100644 index 0000000000000000000000000000000000000000..c51a03ac8e38c55c161ae55fe6ba805a4e1b05f5 --- /dev/null +++ b/resources/subdir/.add_dir_to_git @@ -0,0 +1 @@ +This directory should be created when cloning or pulling this git repository. diff --git a/test_profile/paths/authtoken/.add_dir_to_git b/test_profile/paths/authtoken/.add_dir_to_git new file mode 100644 index 0000000000000000000000000000000000000000..c51a03ac8e38c55c161ae55fe6ba805a4e1b05f5 --- /dev/null +++ b/test_profile/paths/authtoken/.add_dir_to_git @@ -0,0 +1 @@ +This directory should be created when cloning or pulling this git repository. diff --git a/test_profile/profile.yml b/test_profile/profile.yml index 1bb66d389635941133da1bd6a84f37159ac4d6cc..388cc71d76da22464769ba8454d61e175dd1f7f5 100644 --- a/test_profile/profile.yml +++ b/test_profile/profile.yml @@ -31,6 +31,7 @@ default: # - debug-scripting-bin :: Used as the server-side scripting bin dir. # debug: false debug: true + debug_authtoken_dir: "/tmp/linkahead-pyinttest/authtoken/" # URL of the docker registry. Set to "" to look locally. # registry_server: "gitlab.indiscale.com:5050" # The account for accessing the registry server. "" means no account. @@ -93,6 +94,7 @@ default: # database. _CAOSDB_INTEGRATION_TEST_SUITE_KEY: "_CAOSDB_PYINTTEST_SUITE" TRANSACTION_BENCHMARK_ENABLED: "TRUE" + # SERVER_SIDE_SCRIPTING_BIN_DIRS: "" # HTTPS port of the grpc end-point # grpc_server_port_https: 8443