diff --git a/.gitignore b/.gitignore index 7c8f704b35be672aa724b61cdf63d17545366b54..4b05b5ffdc1bb4836844e75b6153b6eb21206e95 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ dist/ # libraries PyCaosDB*.egg + +# user config +pycaosdb.ini diff --git a/pycaosdb.ini.template b/pycaosdb.ini.template new file mode 100644 index 0000000000000000000000000000000000000000..8f1d9d40f7af1fc0d2a515fbde6138c9b63e618d --- /dev/null +++ b/pycaosdb.ini.template @@ -0,0 +1,24 @@ +# -*- mode:conf; -*- +## This sections needs to exist in addition to the usual section +[IntegrationTests] +test_server_side_scripting.bin_dir=/scripting-bin/ + +# location of the files from the pyinttest perspective +test_files.test_insert_files_in_dir.local=/extroot/test_insert_files_in_dir/ +# location of the files from the caosdb_servers perspective +test_files.test_insert_files_in_dir.server=/opt/caosdb/mnt/extroot/test_insert_files_in_dir/ + + +## Insert your usual settings here +[Connection] +#url=https://caosdb-server:10443/ +#username=admin +#cacert=/cert/caosdb.cert.pem +#cacert=/etc/ssl/cert.pem +#debug=0 + +#passwordmethod=plain +#password=caosdb + +#ssl_insecure=True +#timeout=500 diff --git a/tests/test_issues.py b/tests/test_issues.py index 9fbb90e45c6e15eb4dc7cba49f0a5f5cb19e4ce8..f7f4b60387a9cd4716501b0db8dede30b0cdb6e7 100644 --- a/tests/test_issues.py +++ b/tests/test_issues.py @@ -80,6 +80,7 @@ def test_issue_85_a(): c.insert() # Raised java.sql.SQLIntegrityConstraintViolationException: # # Duplicate entry '12345-12346-12345' for key 'PRIMARY' + @with_setup(setup, teardown) def test_issue_85_b(): """SQLIntegrityConstraintViolationException for special inheritance patterns. @@ -99,4 +100,4 @@ def test_issue_85_b(): C.add_parent(C) C.update() C.add_parent(A) - C.update() # Failed at this step + C.update() # Failed at this step