Simplify env for Akonadi isolated tests

wilder
Daniel Vrátil 9 years ago
parent ea86c56b32
commit d47da48dc8
  1. 8
      autotests/unittestenv/config-postgresql-fs.xml
  2. 8
      autotests/unittestenv/config-sqlite-db.xml
  3. 2
      autotests/unittestenv/config.xml
  4. 6
      autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
  5. 10
      autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
  6. 10
      autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
  7. 2
      src/filter/autotests/CMakeLists.txt
  8. 10
      src/filter/autotests/unittestenv/config-mysql-fs.xml
  9. 10
      src/filter/autotests/unittestenv/config-postgresql-fs.xml
  10. 10
      src/filter/autotests/unittestenv/config-sqlite-db.xml
  11. 1
      src/filter/autotests/unittestenv/config.xml
  12. 6
      src/filter/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
  13. 10
      src/filter/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
  14. 10
      src/filter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc
  15. 10
      src/filter/filterimporter/autotests/unittestenv/config-postgresql-fs.xml
  16. 10
      src/filter/filterimporter/autotests/unittestenv/config-sqlite-db.xml
  17. 2
      src/filter/filterimporter/autotests/unittestenv/config.xml
  18. 6
      src/filter/filterimporter/autotests/unittestenv/xdgconfig-mysql.fs/akonadi/akonadiserverrc
  19. 10
      src/filter/filterimporter/autotests/unittestenv/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
  20. 10
      src/filter/filterimporter/autotests/unittestenv/xdgconfig-sqlite.db/akonadi/akonadiserverrc

@ -1,8 +0,0 @@
<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>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
</config>

@ -1,8 +0,0 @@
<config>
<confighome>xdgconfig-sqlite.db</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">sqlite</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
</config>

@ -1,8 +1,6 @@
<config>
<confighome>xdgconfig-mysql.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">mysql</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
</config>

@ -1,6 +0,0 @@
[%General]
SizeThreshold=0
ExternalPayload=true
[Search]
Manager=Dummy

@ -1,10 +0,0 @@
[%General]
Driver=QPSQL
SizeThreshold=0
ExternalPayload=true
[Search]
Manager=Dummy
[QPSQL]
StartServer=true

@ -1,10 +0,0 @@
[%General]
# This is a slightly adjusted version of the QSQLITE driver from Qt
# It is provided by akonadi itself
Driver=QSQLITE3
[Debug]
Tracer=null
[Search]
Manager=Dummy

@ -5,7 +5,7 @@ set(mailcommon_filter_test_LIBS Qt5::Test Qt5::Gui KF5::AkonadiCore KF5::Akonadi
)
macro(add_mailcommon_filter_test _name)
ecm_add_test(${ARGN}
ecm_add_test(${ARGN}
TEST_NAME ${_name}
NAME_PREFIX "mailcommon-filter-"
LINK_LIBRARIES ${mailcommon_filter_test_LIBS}

@ -1,10 +0,0 @@
<config>
<confighome>xdgconfig-mysql.fs</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">mysql</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
</config>

@ -1,10 +0,0 @@
<config>
<confighome>xdgconfig-postgresql.fs</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">postgresql</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
</config>

@ -1,10 +0,0 @@
<config>
<confighome>xdgconfig-sqlite.db</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">sqlite</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
</config>

@ -1,5 +1,4 @@
<config>
<confighome>xdgconfig</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>

@ -1,6 +0,0 @@
[%General]
SizeThreshold=0
ExternalPayload=true
[Search]
Manager=Dummy

@ -1,10 +0,0 @@
[%General]
Driver=QPSQL
SizeThreshold=0
ExternalPayload=true
[Search]
Manager=Dummy
[QPSQL]
StartServer=true

@ -1,10 +0,0 @@
[%General]
# This is a slightly adjusted version of the QSQLITE driver from Qt
# It is provided by akonadi itself
Driver=QSQLITE3
[Debug]
Tracer=null
[Search]
Manager=Dummy

@ -1,10 +0,0 @@
<config>
<confighome>xdgconfig-postgresql.fs</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">postgresql</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
</config>

@ -1,10 +0,0 @@
<config>
<confighome>xdgconfig-sqlite.db</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">sqlite</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
</config>

@ -1,10 +1,8 @@
<config>
<confighome>xdgconfig-mysql.fs</confighome>
<datahome>xdglocal</datahome>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<agent synchronize="true">akonadi_knut_resource</agent>
<envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
<envvar name="TESTRUNNER_DB_ENVIRONMENT">mysql</envvar>
<envvar name="AKONADI_OVERRIDE_SEARCHPLUGIN">akonadi_test_searchplugin</envvar>
</config>

@ -1,6 +0,0 @@
[%General]
SizeThreshold=0
ExternalPayload=true
[Search]
Manager=Dummy

@ -1,10 +0,0 @@
[%General]
Driver=QPSQL
SizeThreshold=0
ExternalPayload=true
[Search]
Manager=Dummy
[QPSQL]
StartServer=true

@ -1,10 +0,0 @@
[%General]
# This is a slightly adjusted version of the QSQLITE driver from Qt
# It is provided by akonadi itself
Driver=QSQLITE3
[Debug]
Tracer=null
[Search]
Manager=Dummy
Loading…
Cancel
Save