sync with trunk

3 files changed, 42 insertions, 58 deletions

diff --git a/debian/changelog b/debian/changelog
index 543caf4..de3f46c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,36 +1,32 @@
-indicator-datetime (13.10.0+15.04.20150618-0ubuntu1) vivid; urgency=medium
+indicator-datetime (13.10.0+15.10.20150624-0ubuntu1) wily; urgency=medium
 
   [ Charles Kerr ]
-  * Fix invalid valarms in older clock-app alarms. (LP: #1465806)
+  * Speedups/cleanups to the EDS regression tests
 
- -- CI Train Bot <ci-train-bot@canonical.com>  Thu, 18 Jun 2015 19:25:41 +0000
+ -- CI Train Bot <ci-train-bot@canonical.com>  Wed, 24 Jun 2015 12:51:27 +0000
 
-indicator-datetime (13.10.0+15.04.20150521-0ubuntu1) vivid; urgency=medium
+indicator-datetime (13.10.0+15.10.20150622-0ubuntu1) wily; urgency=medium
 
   [ Charles Kerr ]
-  * Fix regression that caused nonrepeating alarms to go off at the
-    wrong time. (LP: #1456281)
+  * Fix bugs relating to timezones and triggers from clock-app alarms.
+    (LP: #1456281, #1465806)
 
- -- CI Train Bot <ci-train-bot@canonical.com>  Thu, 21 May 2015 15:24:31 +0000
+ -- CI Train Bot <ci-train-bot@canonical.com>  Mon, 22 Jun 2015 18:03:38 +0000
 
-indicator-datetime (13.10.0+15.04.20150515-0ubuntu1) vivid; urgency=medium
+indicator-datetime (13.10.0+15.10.20150515-0ubuntu1) wily; urgency=medium
 
   [ Charles Kerr ]
   * Honor the 'other vibrations' setting to enable/disable vibrations
     when alarm notifications are shown.
 
- -- CI Train Bot <ci-train-bot@canonical.com>  Fri, 15 May 2015 19:33:54 +0000
+ -- CI Train Bot <ci-train-bot@canonical.com>  Fri, 15 May 2015 16:41:41 +0000
 
-indicator-datetime (13.10.0+15.04.20150508.2-0ubuntu1) vivid; urgency=medium
-
-  [ CI Train Bot ]
-  * New rebuild forced.
+indicator-datetime (13.10.0+15.04.20150618-0ubuntu1) vivid; urgency=medium
 
   [ Charles Kerr ]
-  * If the "X-CANONICAL-ACTIVATION-URL" x-prop is defined in the VTODO
-    or VEVENT, use it for url delegation. (LP: #1426519)
+  * Fix invalid valarms in older clock-app alarms. (LP: #1465806)
 
- -- CI Train Bot <ci-train-bot@canonical.com>  Fri, 08 May 2015 20:01:09 +0000
+ -- CI Train Bot <ci-train-bot@canonical.com>  Thu, 18 Jun 2015 19:25:41 +0000
 
 indicator-datetime (13.10.0+15.04.20150406-0ubuntu1) vivid; urgency=medium
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8196654..9d26484 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -70,13 +70,6 @@ target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${SERVICE_DEP
 ## 
 
 find_program(DBUS_RUNNER dbus-test-runner)
-find_program(EVOLUTION_CALENDAR_FACTORY evolution-calendar-factory PATHS /usr/lib/evolution/)
-find_program(EVOLUTION_SOURCE_REGISTRY evolution-source-registry PATHS /usr/lib/evolution/)
-find_program(GVFSD gvfsd PATHS /usr/lib/gvfs/)
-OPTION(EVOLUTION_SOURCE_SERVICE_NAME "DBus name for source registry")
-if(NOT EVOLUTION_SOURCE_SERVICE_NAME)
-    set(EVOLUTION_SOURCE_SERVICE_NAME "org.gnome.evolution.dataserver.Sources3")
-endif()
 
 function(add_eds_ics_test_by_name name)
   set (TEST_NAME ${name})
@@ -84,15 +77,11 @@ function(add_eds_ics_test_by_name name)
   target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS})
   add_test (${TEST_NAME}
             ${CMAKE_CURRENT_SOURCE_DIR}/run-eds-ics-test.sh
-            ${DBUS_RUNNER}                                            # arg1: dbus-test-runner exec
-            ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}                  # arg2: test executable path
-            ${TEST_NAME}                                              # arg3: test name
-            ${EVOLUTION_CALENDAR_FACTORY}                             # arg4: evolution-calendar-factory exec
-            ${EVOLUTION_SOURCE_SERVICE_NAME}                          # arg5: dbus name for source registry 
-            ${EVOLUTION_SOURCE_REGISTRY}                              # arg6: evolution-source-registry exec
-            ${GVFSD}                                                  # arg7: gvfsd exec
-            ${CMAKE_CURRENT_SOURCE_DIR}/test-eds-ics-config-files     # arg8: base directory for config file template
-            ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics)             # arg9: the ical file for this test
+            ${DBUS_RUNNER}                                         # arg1: dbus-test-runner exec
+            ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME}               # arg2: test executable path
+            ${TEST_NAME}                                           # arg3: test name
+            ${CMAKE_CURRENT_SOURCE_DIR}/test-eds-ics-config-files  # arg4: base directory for config file template
+            ${CMAKE_CURRENT_SOURCE_DIR}/${TEST_NAME}.ics)          # arg5: the ical file for this test
 endfunction()
 add_eds_ics_test_by_name(test-eds-ics-all-day-events)
 add_eds_ics_test_by_name(test-eds-ics-repeating-events)
diff --git a/tests/run-eds-ics-test.sh b/tests/run-eds-ics-test.sh
index a257de4..63fc6bc 100755
--- a/tests/run-eds-ics-test.sh
+++ b/tests/run-eds-ics-test.sh
@@ -1,19 +1,22 @@
 #!/bin/sh
 
-echo ARG0=$0 # this script
-echo ARG1=$1 # full executable path of dbus-test-runner
-echo ARG2=$2 # full executable path of test app
-echo ARG3=$3 # test name
-echo ARG4=$4 # full executable path of evolution-calendar-factory
-echo ARG5=$5 # bus service name of calendar factory
-echo ARG6=$6 # full exectuable path of evolution-source-registry
-echo ARG7=$7 # full executable path of gvfs
-echo ARG8=$8 # config files
-echo ARG8=$9 # ics file
+SELF=$0        # this script
+TEST_RUNNER=$1 # full executable path of dbus-test-runner
+TEST_EXEC=$2   # full executable path of test app
+TEST_NAME=$3   # test name
+CONFIG_DIR=$4  # config files
+ICS_FILE=$5    # ical file holding test data
 
-# set up the tmpdir and tell the shell to purge it when we exit
-export TEST_TMP_DIR=$(mktemp -p "${TMPDIR:-/tmp}" -d $3-XXXXXXXXXX) || exit 1
-echo "running test '$3' in ${TEST_TMP_DIR}"
+echo "this script: ${SELF}"
+echo "test-runner: ${TEST_RUNNER}"
+echo "test-exec: ${TEST_EXEC}"
+echo "test-name: ${TEST_NAME}"
+echo "config-dir: ${CONFIG_DIR}"
+echo "ics-file: ${ICS_FILE}"
+
+# set up the tmpdir
+export TEST_TMP_DIR=$(mktemp -p "${TMPDIR:-/tmp}" -d ${TEST_NAME}-XXXXXXXXXX) || exit 1
+echo "running test '${TEST_NAME}' in ${TEST_TMP_DIR}"
 
 # set up the environment variables
 export QT_QPA_PLATFORM=minimal
@@ -40,23 +43,19 @@ echo HOMEDIR=${HOME}
 rm -rf ${XDG_DATA_HOME}
 
 # if there are canned config files for this test, move them into place now
-if [ -d $8 ]; then
-  echo "copying files from $8 to $HOME"
-  cp --verbose --archive $8/. $HOME
+if [ -d ${CONFIG_DIR} ]; then
+  echo "copying files from ${CONFIG_DIR} to $HOME"
+  cp --verbose --archive ${CONFIG_DIR}/. $HOME
 fi
 
-# if there's a specific ics file to test, copy it on top of the canned confilg files
-if [ -e $9 ]; then
-  echo "copying $9 into $HOME"
-  cp --verbose --archive $9 ${XDG_DATA_HOME}/evolution/tasks/system/tasks.ics
+# if there's a specific ics file to test, copy it on top of the canned config files
+if [ -e ${ICS_FILE} ]; then
+  echo "copying ${ICS_FILE} into $HOME"
+  cp --verbose --archive ${ICS_FILE} ${XDG_DATA_HOME}/evolution/tasks/system/tasks.ics
 fi
 
-# run dbus-test-runner
-$1 --keep-env --max-wait=90 \
---task $2 --task-name $3 --wait-until-complete --wait-for=org.gnome.evolution.dataserver.Calendar4 \
---task $4 --task-name "evolution" --wait-until-complete -r
-#--task $6 --task-name "source-registry" --wait-for=org.gtk.vfs.Daemon -r \
-#--task $7 --task-name "gvfsd" -r
+# run the test
+${TEST_RUNNER} --keep-env --max-wait=90 --task ${TEST_EXEC} --task-name ${TEST_NAME} --wait-until-complete 
 rv=$?
 
 # if the test passed, blow away the tmpdir