summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2013-04-11 20:20:19 +0100
committerLars Wirzenius <liw@liw.fi>2013-04-11 20:20:19 +0100
commitb4601ba1ddf6d3442555b719478e1d60f1a36dd1 (patch)
treeabe348c00d4982a746da830b89a6168264ff2ebc
parentaa2aeb3254a890c74d3d684356ca6c1a0afebb87 (diff)
downloaddesktop-cronish-b4601ba1ddf6d3442555b719478e1d60f1a36dd1.tar.gz
Remove most tests
No need to have more than one, right now. Too many tests make it harder to do TDD.
-rwxr-xr-xdesktop-cronish10
-rwxr-xr-xtests/date.script8
-rwxr-xr-xtests/mtime-nofile.script14
-rwxr-xr-xtests/mtime-old.script14
-rwxr-xr-xtests/timeout.script13
5 files changed, 15 insertions, 44 deletions
diff --git a/desktop-cronish b/desktop-cronish
index c9550ee..a67af1e 100755
--- a/desktop-cronish
+++ b/desktop-cronish
@@ -23,7 +23,15 @@ __version__ = '0.0'
class DesktopCronish(cliapp.Application):
- pass
+ def add_settings(self):
+ self.settings.integer(
+ ['max-jobs'],
+ 'run at least N jobs, then quit (use 0 for infinite)',
+ metavar='N',
+ default=0)
+
+ def process_args(self, args):
+ pass
DesktopCronish(version=__version__).run()
diff --git a/tests/date.script b/tests/date.script
index 7214bb7..2f66f1f 100755
--- a/tests/date.script
+++ b/tests/date.script
@@ -2,6 +2,7 @@
set -eu
+> "$DATADIR/foo.output"
cat <<EOF > "$DATADIR/foo.tasks"
date:
interval: 2
@@ -9,5 +10,8 @@ date:
EOF
-./desktop-cronish --stop-after=5 "$DATADIR/foo.tasks"
-awk 'NR > 1 { print $1 - prev } { prev = $1 }' | awk '$1 < 1'
+./desktop-cronish --max-jobs=5 "$DATADIR/foo.tasks"
+
+wc -l < "$DATADIR/foo.output"
+awk 'NR > 1 { print $1 - prev } { prev = $1 }' "$DATADIR/foo.output" |
+ awk '$1 < 1'
diff --git a/tests/mtime-nofile.script b/tests/mtime-nofile.script
deleted file mode 100755
index 30ea4b1..0000000
--- a/tests/mtime-nofile.script
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-rm -f "$DATADIR/foo.trigger"
-cat <<EOF > "$DATADIR/foo.tasks"
-date:
- trigger-file: $DATADIR/foo.trigger
- trigger-age: 10
- command: echo triggered > $DATADIR/foo.out
-EOF
-
-
-./desktop-cronish --stop-after 5 "$DATADIR/foo.tasks"
diff --git a/tests/mtime-old.script b/tests/mtime-old.script
deleted file mode 100755
index 4d2d61d..0000000
--- a/tests/mtime-old.script
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-touch -t 197001010000.00 "$DATADIR/foo.trigger"
-cat <<EOF > "$DATADIR/foo.tasks"
-date:
- trigger-file: $DATADIR/foo.trigger
- trigger-age: 10
- command: echo triggered > $DATADIR/foo.out
-EOF
-
-
-./desktop-cronish --stop-after 5 "$DATADIR/foo.tasks"
diff --git a/tests/timeout.script b/tests/timeout.script
deleted file mode 100755
index b6b4651..0000000
--- a/tests/timeout.script
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-cat <<EOF > "$DATADIR/foo.tasks"
-date:
- interval: 2
- timeout: 1
- command: sleep 1000
-EOF
-
-
-./desktop-cronish "$DATADIR/foo.tasks"