summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Vrátil <dvratil@kde.org>2016-09-14 12:16:29 (GMT)
committerDaniel Vrátil <dvratil@kde.org>2016-09-14 12:16:29 (GMT)
commit14872aa3b953bd8fd562eadbdff5e5759cd1368e (patch)
tree6250d8c9525085b61f9f80876203bf8e83c81785
parentccf13ae625dcb85f5a935474543f09b349262e1f (diff)
Adapt unittestenv to support all backends
-rw-r--r--agent/autotests/unittestenv/config-mysql-fs.xml (renamed from agent/autotests/unittestenv/config-mysql-db.xml)2
-rw-r--r--agent/autotests/unittestenv/config-postgresql-fs.xml7
-rw-r--r--agent/autotests/unittestenv/config-sqlite-db.xml2
-rw-r--r--agent/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc (renamed from agent/autotests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc)1
-rw-r--r--agent/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc10
5 files changed, 20 insertions, 2 deletions
diff --git a/agent/autotests/unittestenv/config-mysql-db.xml b/agent/autotests/unittestenv/config-mysql-fs.xml
index 66a8f78..ebaffd8 100644
--- a/agent/autotests/unittestenv/config-mysql-db.xml
+++ b/agent/autotests/unittestenv/config-mysql-fs.xml
@@ -1,5 +1,5 @@
<config>
- <confighome>xdgconfig-mysql.db</confighome>
+ <confighome>xdgconfig-mysql.fs</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
diff --git a/agent/autotests/unittestenv/config-postgresql-fs.xml b/agent/autotests/unittestenv/config-postgresql-fs.xml
new file mode 100644
index 0000000..f5ed4b5
--- /dev/null
+++ b/agent/autotests/unittestenv/config-postgresql-fs.xml
@@ -0,0 +1,7 @@
+<config>
+ <confighome>xdgconfig-postgresql.fs</confighome>
+ <datahome>xdglocal</datahome>
+ <agent synchronize="true">akonadi_knut_resource</agent>
+ <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
+ <envvar name="TESTRUNNER_DB_ENVIRONMENT">postgresql</envvar>
+</config>
diff --git a/agent/autotests/unittestenv/config-sqlite-db.xml b/agent/autotests/unittestenv/config-sqlite-db.xml
index 1e7c98b..071e1b7 100644
--- a/agent/autotests/unittestenv/config-sqlite-db.xml
+++ b/agent/autotests/unittestenv/config-sqlite-db.xml
@@ -1,5 +1,5 @@
<config>
- <confighome>xdgconfig-sqlite.db</confighome>
+ <confighome>xdgconfig-sqlite.fs</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
diff --git a/agent/autotests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc b/agent/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
index fa9b2d4..467dd0c 100644
--- a/agent/autotests/unittestenv/xdgconfig-mysql.db/akonadi/akonadiserverrc
+++ b/agent/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
@@ -1,5 +1,6 @@
[%General]
ExternalPayload=false
+SizeThreshold=0
[Search]
Manager=Dummy
diff --git a/agent/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc b/agent/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
new file mode 100644
index 0000000..8333c73
--- /dev/null
+++ b/agent/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
@@ -0,0 +1,10 @@
+[%General]
+Driver=QPSQL
+SizeThreshold=0
+ExternalPayload=true
+
+[Search]
+Manager=Dummy
+
+[QPSQL]
+StartServer=true