cleaned out yet some of the 'new generation' stuff from the documenatation

3 files changed, 3 insertions, 26 deletions

diff --git a/tests/_setup_alias b/tests/_setup_alias
index 0f2c6de..223467e 100644
--- a/tests/_setup_alias
+++ b/tests/_setup_alias
@@ -13,18 +13,8 @@ error() {
 [ -z "$calendar_cli" ] && [ -x ../calendar-cli.py ] && calendar_cli=../calendar-cli.py
 [ -z "$calendar_cli" ] && error "couldn't find ./calendar_cli.py nor ../calendar_cli.py"
 
-[ -z "$kal" ] && [ -x ./cal.py ] && kal=./cal.py
-[ -z "$kal" ] && [ -x ../cal.py ] && kal=../cal.py
-[ -z "$kal" ] && error "couldn't find ./cal.py nor ../cal.py"
-
 calendar_cli() {
     echo "    $calendar_cli $@"
     output=$($calendar_cli "$@" | tee $outfile)
     [ -z "$output" ] || [ -z "$QUIET" ] || echo $output
 }
-
-kal() {
-    echo "    $kal $@"
-    output=$($kal "$@"  | tee $outfile)
-    [ -z "$output" ] || [ -z "$QUIET" ] || echo $output
-}
diff --git a/tests/test_calendar-cli.sh b/tests/test_calendar-cli.sh
index 1010bae..b33e435 100755
--- a/tests/test_calendar-cli.sh
+++ b/tests/test_calendar-cli.sh
@@ -3,7 +3,7 @@
 storage=$(mktemp -d)
 
 echo "This script will attempt to set up a Radicale server and a Xandikos server and run the test code towards those two servers"
-echo "The test code itself is found in tests.sh and tests_kal.sh"
+echo "The test code itself is found in tests.sh"
 
 export RUNTESTSNOPAUSE="foo"
 
@@ -16,7 +16,7 @@ radicale_pid=$(jobs -l | perl -ne '/^\[\d+\]\+\s+(\d+)\s+Running/ && print $1')
 if [ -n "$radicale_pid" ]
 then
     echo "## Radicale now running on pid $radicale_pid"
-    calendar_cli="../calendar-cli.py --caldav-url=http://localhost:5232/ --caldav-pass=password1 --caldav-user=testuser --calendar-url=/testuser/calendar-cli-test-calendar"
+    calendar_cli="../bin/calendar-cli.py --caldav-url=http://localhost:5232/ --caldav-pass=password1 --caldav-user=testuser --calendar-url=/testuser/calendar-cli-test-calendar"
     echo "## Creating a calendar"
     $calendar_cli calendar create calendar-cli-test-calendar
     
@@ -56,7 +56,7 @@ fi
 if [ -n "$xandikos_pid" ]
 then
     echo "## Xandikos now running on pid $xandikos_pid"
-    calendar_cli="../calendar-cli --caldav-url=http://localhost:8080/ --caldav-user=user"
+    calendar_cli="../bin/calendar-cli --caldav-url=http://localhost:8080/ --caldav-user=user"
     export calendar_cli
     ./tests.sh
     kill $xandikos_pid
diff --git a/tests/tests.sh b/tests/tests.sh
index 7d1e277..f1c0a26 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -94,19 +94,6 @@ echo "$output" | grep -q "20101010" || error "could not find the date"
 echo "$output" | grep -q "20101010T" && error "a supposed whole day event was found to be with the time of day"
 echo "OK: found the event"
 
-## saving the ics data
-tmpfile=$(mktemp)
-cat $outfile > $tmpfile
-
-echo "## cleanup, delete it"
-calendar_cli calendar delete --event-uid=$uid
-
-rm $tmpfile
-calendar_cli  --icalendar calendar agenda --from-time=2010-10-13 --agenda-days=1
-echo "$output" | grep -q "whole day" || error "could not find the event"
-echo "$output" | grep -q "20101010" || error "could not find the date"
-echo "$output" | grep -q "20101010T" && error "a supposed whole day event was found to be with the time of day"
-echo "OK: found the event"
 echo "## cleanup, delete it"
 calendar_cli calendar delete --event-uid=$uid