From 6199c110a79c8476b0d2d41fbb466616ab0968a0 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@harvey>
Date: Mon, 23 Mar 2020 12:27:13 +0100
Subject: [PATCH] DOC: Added example pycaosdb.ini where it can be found more
easily.
---
.gitignore | 3 +++
pycaosdb.ini.template | 24 ++++++++++++++++++++++++
tests/test_issues.py | 3 ++-
3 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 pycaosdb.ini.template
diff --git a/.gitignore b/.gitignore
index 7c8f704..4b05b5f 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 0000000..8f1d9d4
--- /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 9fbb90e..f7f4b60 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
--
GitLab