October 2013 - tor-commits - lists.torproject.org

[tlsdate/debian-master] Merge branch 'master' into debian-master
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

1 0

[tlsdate/master] Fix subprocess watching.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 691a39f31465c3118a31d3c8be580cbbaf603578 Author: elly <elly(a)leptoquark.net> Date: Fri Jun 21 12:01:18 2013 -0400 Fix subprocess watching. Currently, the subprocess watching code polls with a delay between attempts. Instead, introduce wait_with_timeout() and use it, simplifying this code. Signed-off-by: Elly Fong-Jones <elly(a)leptoquark.net> --- CHANGELOG | 1 + etc/tlsdated.conf | 3 +- man/tlsdated.conf.5 | 6 ++-- src/tlsdate.h | 6 ++-- src/tlsdated-unittest.c | 14 +++------ src/tlsdated.c | 77 ++++++++++++++++++----------------------------- src/util.c | 31 +++++++++++++++++++ src/util.h | 4 +++ 8 files changed, 75 insertions(+), 67 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fbe7a83..c408a15 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,7 @@ Add Mac OS X 10.8.3 support Extensive setup/install documentation is now present in INSTALL for most OSes Add DragonFly BSD 3.3 support + Refactored subprocess watching. 0.0.6 Mon 18 Feb, 2013 Ensure that tlsdate compiles with g++ by explicit casting rather than implicit casting by whatever compiler is compiling tlsdate. diff --git a/etc/tlsdated.conf b/etc/tlsdated.conf index 9f9b43e..c6dbbf0 100644 --- a/etc/tlsdated.conf +++ b/etc/tlsdated.conf @@ -12,8 +12,7 @@ should-netlink yes should-save-disk yes should-sync-hwclock yes steady-state-interval 86400 -subprocess-tries 10 -subprocess-wait-between-tries 3 +subprocess-timeout 30 verbose yes wait-between-tries 10 diff --git a/man/tlsdated.conf.5 b/man/tlsdated.conf.5 index 13fb153..79ed27a 100644 --- a/man/tlsdated.conf.5 +++ b/man/tlsdated.conf.5 @@ -42,10 +42,8 @@ at exit. If enabled, set the hwclock to the fetched time. .IP "steady-state-interval [int]" Check at least once this many seconds when in steady state. -.IP "subprocess-tries [int]" -How many times to try waiting for the subprocess. -.IP "subprocess-wait-between-tries [int]" -How many seconds to wait between each attempt to wait for the subprocess. +.IP "subprocess-timeout [int]" +How many seconds to wait for the subprocess to exit. .IP "verbose [bool]" If enabled, tlsdated will be annoyingly verbose in syslog and on stdout. .IP "wait-between-tries [int]" diff --git a/src/tlsdate.h b/src/tlsdate.h index 5b24980..978396d 100644 --- a/src/tlsdate.h +++ b/src/tlsdate.h @@ -33,8 +33,7 @@ /* tlsdated magic numbers */ #define MAX_TRIES 10 #define WAIT_BETWEEN_TRIES 10 -#define SUBPROCESS_TRIES 10 -#define SUBPROCESS_WAIT_BETWEEN_TRIES 3 +#define SUBPROCESS_TIMEOUT 30 #define STEADY_STATE_INTERVAL 86400 #define DEFAULT_SYNC_HWCLOCK 1 #define DEFAULT_LOAD_FROM_DISK 1 @@ -67,8 +66,7 @@ struct opts { int max_tries; int min_steady_state_interval; int wait_between_tries; - int subprocess_tries; - int subprocess_wait_between_tries; + int subprocess_timeout; int steady_state_interval; const char *base_path; char **base_argv; diff --git a/src/tlsdated-unittest.c b/src/tlsdated-unittest.c index cb30313..5baca13 100644 --- a/src/tlsdated-unittest.c +++ b/src/tlsdated-unittest.c @@ -118,8 +118,7 @@ TEST(tlsdate_tests) { memset(&opts, 0, sizeof(opts)); opts.sources = &source; opts.base_argv = args; - opts.subprocess_tries = 2; - opts.subprocess_wait_between_tries = 1; + opts.subprocess_timeout = 1; extern char **environ; EXPECT_EQ(1, tlsdate(&opts, environ)); args[0] = "/bin/false"; @@ -129,7 +128,7 @@ TEST(tlsdate_tests) { args[0] = "src/test/sleep-wrap"; args[1] = "3"; EXPECT_EQ(-1, tlsdate(&opts, environ)); - opts.subprocess_wait_between_tries = 5; + opts.subprocess_timeout = 5; EXPECT_EQ(0, tlsdate(&opts, environ)); } @@ -167,8 +166,7 @@ TEST(rotate_hosts) { memset(&opts, 0, sizeof(opts)); opts.sources = &s1; opts.base_argv = args; - opts.subprocess_tries = 2; - opts.subprocess_wait_between_tries = 1; + opts.subprocess_timeout = 2; extern char **environ; EXPECT_EQ(1, tlsdate(&opts, environ)); EXPECT_EQ(2, tlsdate(&opts, environ)); @@ -188,8 +186,7 @@ TEST(proxy_override) { memset(&opts, 0, sizeof(opts)); opts.sources = &s1; opts.base_argv = args; - opts.subprocess_tries = 2; - opts.subprocess_wait_between_tries = 1; + opts.subprocess_timeout = 2; extern char **environ; EXPECT_EQ(1, tlsdate(&opts, environ)); s1.proxy = "socks5://bad.proxy"; @@ -210,8 +207,7 @@ TEST(tlsdate_args) { memset(&opts, 0, sizeof(opts)); opts.sources = &s1; opts.base_argv = args; - opts.subprocess_tries = 2; - opts.subprocess_wait_between_tries = 1; + opts.subprocess_timeout = 2; opts.leap = 1; verbose = 1; EXPECT_EQ(9, tlsdate(&opts, environ)); diff --git a/src/tlsdated.c b/src/tlsdated.c index ef9fe68..7816223 100644 --- a/src/tlsdated.c +++ b/src/tlsdated.c @@ -106,43 +106,35 @@ int tlsdate (struct opts *opts, char *envp[]) { pid_t pid; + pid_t exited; + int status; + build_argv(opts); - - if ((pid = fork ()) > 0) - { - /* - * We launched tlsdate; wait for up to kMaxTries intervals of - * kWaitBetweenTries for it to exit, then kill it if it still - * hasn't. - */ - int status = -1; - int i = 0; - for (i = 0; i < opts->subprocess_tries; ++i) + + pid = fork(); + if (pid < 0) { - info ("wait for child attempt %d", i); - if (waitpid (-1, &status, WNOHANG) > 0) - break; - sleep (opts->subprocess_wait_between_tries); + pinfo("fork() failed"); + return -1; } - if (i == opts->subprocess_tries) + else if (pid == 0) { - error ("child hung?"); - kill (pid, SIGKILL); - /* still have to wait() so we don't leak the child. */ - wait (&status); + execve(opts->argv[0], opts->argv, envp); + pinfo("execve() failed"); + exit(1); + } + + exited = wait_with_timeout(&status, opts->subprocess_timeout); + info("child %d exited with %d", exited, status); + + if (exited == -ETIMEDOUT) + { + kill(pid, SIGKILL); + wait(&status); return -1; } - info ("child exited with %d", status); - return WIFEXITED (status) ? WEXITSTATUS (status) : -1; - } - else if (pid < 0) - { - pinfo ("fork() failed"); - return -1; - } - execve (opts->argv[0], opts->argv, envp); - pinfo ("execve() failed"); - exit (1); + + return WIFEXITED(status) ? WEXITSTATUS(status) : -1; } /* @@ -394,8 +386,7 @@ set_conf_defaults(struct opts *opts) opts->max_tries = MAX_TRIES; opts->min_steady_state_interval = STEADY_STATE_INTERVAL; opts->wait_between_tries = WAIT_BETWEEN_TRIES; - opts->subprocess_tries = SUBPROCESS_TRIES; - opts->subprocess_wait_between_tries = SUBPROCESS_WAIT_BETWEEN_TRIES; + opts->subprocess_timeout = SUBPROCESS_TIMEOUT; opts->steady_state_interval = STEADY_STATE_INTERVAL; opts->base_path = kCacheDir; opts->base_argv = kDefaultArgv; @@ -418,7 +409,7 @@ parse_argv(struct opts *opts, int argc, char *argv[]) { int opt; - while ((opt = getopt (argc, argv, "hwrpt:d:T:D:c:a:lsvm:j:f:x:")) != -1) + while ((opt = getopt (argc, argv, "hwrpt:d:c:a:lsvm:j:f:x:")) != -1) { switch (opt) { @@ -437,12 +428,6 @@ parse_argv(struct opts *opts, int argc, char *argv[]) case 'd': opts->wait_between_tries = atoi (optarg); break; - case 'T': - opts->subprocess_tries = atoi (optarg); - break; - case 'D': - opts->subprocess_wait_between_tries = atoi (optarg); - break; case 'c': opts->base_path = optarg; break; @@ -572,10 +557,8 @@ load_conf(struct opts *opts) opts->min_steady_state_interval = atoi (e->value); } else if (!strcmp (e->key, "wait-between-tries") && e->value) { opts->wait_between_tries = atoi (e->value); - } else if (!strcmp (e->key, "subprocess-tries") && e->value) { - opts->subprocess_tries = atoi (e->value); - } else if (!strcmp (e->key, "subprocess-wait-between-tries") && e->value) { - opts->subprocess_wait_between_tries = atoi (e->value); + } else if (!strcmp (e->key, "subprocess-timeout") && e->value) { + opts->subprocess_timeout = atoi (e->value); } else if (!strcmp (e->key, "steady-state-interval") && e->value) { opts->steady_state_interval = atoi (e->value); } else if (!strcmp (e->key, "base-path") && e->value) { @@ -611,10 +594,8 @@ check_conf(struct opts *opts) fatal ("-t argument must be nonzero"); if (!opts->wait_between_tries) fatal ("-d argument must be nonzero"); - if (!opts->subprocess_tries) - fatal ("-T argument must be nonzero"); - if (!opts->subprocess_wait_between_tries) - fatal ("-D argument must be nonzero"); + if (!opts->subprocess_timeout) + fatal ("subprocess timeout must be nonzero"); if (!opts->steady_state_interval) fatal ("-a argument must be nonzero"); if (snprintf (timestamp_path, sizeof (timestamp_path), "%s/timestamp", diff --git a/src/util.c b/src/util.c index 68f3a98..30a0f44 100644 --- a/src/util.c +++ b/src/util.c @@ -9,9 +9,11 @@ #include <grp.h> #include <pwd.h> +#include <signal.h> #include <stdarg.h> #include <stdio.h> #include <sys/types.h> +#include <sys/wait.h> #include <syslog.h> #include <unistd.h> @@ -101,3 +103,32 @@ drop_privs_to (const char *user, const char *group) #endif } +pid_t +wait_with_timeout(int *status, int timeout_secs) +{ + int st = 0; + pid_t exited; + /* synthesize waiting with a timeout by using a helper process. We + * launch a child process that will exit in |timeout_secs|, guaranteeing + * that wait() will return by then. */ + pid_t helper = fork(); + if (helper < 0) + return helper; + if (helper == 0) + { + sleep(timeout_secs); + exit(0); + } + + /* use temporary status to avoid touching it if we do ETIMEDOUT */ + exited = wait(&st); + if (exited == helper) + /* helper exited before any other child did */ + return -ETIMEDOUT; + + /* a real child process exited - don't leak the helper */ + kill(helper, SIGKILL); + waitpid(helper, NULL, 0); + *status = st; + return exited; +} diff --git a/src/util.h b/src/util.h index bfd61dd..2632933 100644 --- a/src/util.h +++ b/src/util.h @@ -37,4 +37,8 @@ static inline int min(int x, int y) { return x < y ? x : y; } void drop_privs_to (const char *user, const char *group); +/* like wait(), but with a timeout. Returns ordinary fork() error codes, or + * ETIMEDOUT. */ +pid_t wait_with_timeout(int *status, int timeout_secs); + #endif /* !UTIL_H */

1 0

[tlsdate/master] Merge pull request #114 from elly/refactor
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 26e983f1cfc58152bb17893d024929f1dfa39de9 Merge: 3f69a22 691a39f Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Jun 24 11:34:32 2013 -0700 Merge pull request #114 from elly/refactor Fix subprocess watching. CHANGELOG | 1 + etc/tlsdated.conf | 3 +- man/tlsdated.conf.5 | 6 ++-- src/tlsdate.h | 6 ++-- src/tlsdated-unittest.c | 14 +++------ src/tlsdated.c | 77 ++++++++++++++++++----------------------------- src/util.c | 31 +++++++++++++++++++ src/util.h | 4 +++ 8 files changed, 75 insertions(+), 67 deletions(-)

1 0

[tlsdate/master] David Hill noticed that we sometimes leave &warp_time uninitalized
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit a2b4adc5724ee531fc875c4a64a206584e0df3c6 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Jun 29 20:05:04 2013 +0200 David Hill noticed that we sometimes leave &warp_time uninitalized --- src/tlsdate-helper.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index 35d6779..e625946 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -1089,18 +1089,16 @@ main(int argc, char **argv) leap = (0 == strcmp ("leapaway", argv[10])); proxy = (0 == strcmp ("none", argv[11]) ? NULL : argv[11]); - if (timewarp) - { + /* Initalize warp_time with RECENT_COMPILE_DATE */ + clock_init_time(&warp_time, RECENT_COMPILE_DATE, 0); - verb ("V: RECENT_COMPILE_DATE is %lu.%06lu\n", - (unsigned long) CLOCK_SEC(&warp_time), - (unsigned long) CLOCK_USEC(&warp_time)); + verb ("V: RECENT_COMPILE_DATE is %lu.%06lu\n", + (unsigned long) CLOCK_SEC(&warp_time), + (unsigned long) CLOCK_USEC(&warp_time)); - if (1 == setclock) { - clock_init_time(&warp_time, RECENT_COMPILE_DATE, 0); - } else { - verb ("V: we'll do the time warp another time - we're not setting clock\n"); - } + if (1 != timewarp) + { + verb ("V: we'll do the time warp another time - we're not setting clock\n"); } /* We are not going to set the clock, thus no need to stay root */

1 0

[tlsdate/master] Merge branch 'master' of github.com:ioerror/tlsdate
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit ce042c6f3e561ddef111119692c0307380ac886b Merge: 7ba9ae2 26e983f Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Jun 30 05:53:06 2013 +0200 Merge branch 'master' of github.com:ioerror/tlsdate CHANGELOG | 1 + etc/tlsdated.conf | 3 +- man/tlsdated.conf.5 | 6 ++-- src/tlsdate.h | 6 ++-- src/tlsdated-unittest.c | 14 +++------ src/tlsdated.c | 77 ++++++++++++++++++----------------------------- src/util.c | 31 +++++++++++++++++++ src/util.h | 4 +++ 8 files changed, 75 insertions(+), 67 deletions(-)

1 0

[tlsdate/master] add verbosity for privilege dropping attempt
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 7ba9ae21144f9d29d67b5028aec2de1738da0a4e Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sat Jun 29 20:08:25 2013 +0200 add verbosity for privilege dropping attempt --- src/tlsdate-helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c index e625946..cd44c97 100644 --- a/src/tlsdate-helper.c +++ b/src/tlsdate-helper.c @@ -1104,6 +1104,7 @@ main(int argc, char **argv) /* We are not going to set the clock, thus no need to stay root */ if (0 == setclock && 0 == timewarp) { + verb ("V: attemping to drop administrator privileges\n"); drop_privs_to (UNPRIV_USER, UNPRIV_GROUP); }

1 0

[tlsdate/master] Merge pull request #116 from elly/integration
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

1 0

[tlsdate/master] Add integration testing.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 234454e5faadda2094e7e454563bcd538984b403 Author: elly <elly(a)leptoquark.net> Date: Mon Jul 8 10:21:15 2013 -0400 Add integration testing. These new integration tests mostly focus on tlsdated's subprocess code. Signed-off-by: Elly Fong-Jones <elly(a)leptoquark.net> --- run-tests | 40 ++++++++++++++++++++++++++++++++++++++++ test.conf | 2 ++ tests/README | 1 + tests/common.sh | 32 ++++++++++++++++++++++++++++++++ tests/run-idle/output | 1 + tests/run-idle/runs | 1 + tests/run-idle/setup | 4 ++++ tests/run-idle/subproc.sh | 6 ++++++ tests/run-idle/teardown | 4 ++++ tests/run-idle/test.conf | 2 ++ tests/run-once/output | 1 + tests/run-once/run-error | 1 + tests/run-once/subproc.sh | 5 +++++ tests/run-routeup/input | 1 + tests/run-routeup/output | 1 + tests/run-routeup/runs | 1 + tests/run-routeup/setup | 4 ++++ tests/run-routeup/subproc.sh | 6 ++++++ tests/run-routeup/teardown | 4 ++++ tests/subproc-retry/input | 1 + tests/subproc-retry/output | 3 +++ tests/subproc-retry/runs | 1 + tests/subproc-retry/setup | 4 ++++ tests/subproc-retry/subproc.sh | 10 ++++++++++ tests/subproc-retry/teardown | 4 ++++ tests/wait-idle/subproc.sh | 7 +++++++ 26 files changed, 147 insertions(+) diff --git a/run-tests b/run-tests new file mode 100755 index 0000000..693fa59 --- /dev/null +++ b/run-tests @@ -0,0 +1,40 @@ +#!/bin/sh + +run_test() { + [ -x "$1"/setup ] && "$1"/setup + if [ -r "$1"/tlsdated-flags ]; then + flags=$(cat "$1"/tlsdated-flags | sed "s/@TESTDIR@/$1/g") + elif [ -r "$1"/test.conf ]; then + flags="-w -p -r -l -s -f $1/test.conf" + else + flags="-w -p -r -l -s -f test.conf" + fi + # flags are deliberately unquoted here so that they'll be interpolated + timeout 5 src/tlsdated $flags -- "$1"/subproc.sh <"$1"/input >"$1"/run-output \ + 2>"$1"/run-err + [ -x "$1"/teardown ] && "$1"/teardown +} + +test_passed() { + diff "$t"/output "$t"/run-output >/dev/null +} + +total=0 +passed=0 + +for t in tests/*; do + [ ! -d "$t" ] && continue + name="$(basename "$t")" + echo -n "$name: " + run_test "$t" + if test_passed "$t"; then + echo "ok" + passed=$((passed + 1)) + else + echo "failed" + fi + total=$((total + 1)) +done +echo "Passed: $passed/$total" +[ $passed != $total ] +exit $? diff --git a/test.conf b/test.conf new file mode 100644 index 0000000..96827ef --- /dev/null +++ b/test.conf @@ -0,0 +1,2 @@ +min-steady-state-interval 0 +wait-between-tries 1 diff --git a/tests/README b/tests/README new file mode 100644 index 0000000..e0c0e00 --- /dev/null +++ b/tests/README @@ -0,0 +1 @@ +Integration tests for tlsdate/tlsdated. diff --git a/tests/common.sh b/tests/common.sh new file mode 100644 index 0000000..96ba238 --- /dev/null +++ b/tests/common.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +kill_tlsdated() { + kill -9 $PPID +} + +passed() { + kill_tlsdated + echo "ok" +} + +failed() { + kill_tlsdated + echo "failed" +} + +mydir() { + echo "$(dirname "$0")" +} + +counter() { + cat "$(mydir)"/"$1" +} + +inc_counter() { + c=$(counter "$1") + echo $((c + 1)) >"$(mydir)"/"$1" +} + +reset_counter() { + echo 0 > "$(mydir)"/"$1" +} diff --git a/tests/run-idle/input b/tests/run-idle/input new file mode 100644 index 0000000..e69de29 diff --git a/tests/run-idle/output b/tests/run-idle/output new file mode 100644 index 0000000..9766475 --- /dev/null +++ b/tests/run-idle/output @@ -0,0 +1 @@ +ok diff --git a/tests/run-idle/runs b/tests/run-idle/runs new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/tests/run-idle/runs @@ -0,0 +1 @@ +2 diff --git a/tests/run-idle/setup b/tests/run-idle/setup new file mode 100755 index 0000000..c4afd68 --- /dev/null +++ b/tests/run-idle/setup @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/run-idle/subproc.sh b/tests/run-idle/subproc.sh new file mode 100755 index 0000000..649a18e --- /dev/null +++ b/tests/run-idle/subproc.sh @@ -0,0 +1,6 @@ +#!/bin/sh +. "$(dirname $0)"/../common.sh + +inc_counter "runs" +c=$(counter "runs") +[ $c -eq 2 ] && passed diff --git a/tests/run-idle/teardown b/tests/run-idle/teardown new file mode 100644 index 0000000..c4afd68 --- /dev/null +++ b/tests/run-idle/teardown @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/run-idle/test.conf b/tests/run-idle/test.conf new file mode 100644 index 0000000..713e8f7 --- /dev/null +++ b/tests/run-idle/test.conf @@ -0,0 +1,2 @@ +min-steady-state-interval 0 +steady-state-interval 2 diff --git a/tests/run-once/input b/tests/run-once/input new file mode 100644 index 0000000..e69de29 diff --git a/tests/run-once/output b/tests/run-once/output new file mode 100644 index 0000000..9766475 --- /dev/null +++ b/tests/run-once/output @@ -0,0 +1 @@ +ok diff --git a/tests/run-once/run-error b/tests/run-once/run-error new file mode 100644 index 0000000..f84e1cf --- /dev/null +++ b/tests/run-once/run-error @@ -0,0 +1 @@ +Killed diff --git a/tests/run-once/subproc.sh b/tests/run-once/subproc.sh new file mode 100755 index 0000000..7ccb759 --- /dev/null +++ b/tests/run-once/subproc.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. "$(dirname $0)"/../common.sh + +echo "ok" +kill_tlsdated diff --git a/tests/run-routeup/input b/tests/run-routeup/input new file mode 100644 index 0000000..4ae8ef0 --- /dev/null +++ b/tests/run-routeup/input @@ -0,0 +1 @@ +u diff --git a/tests/run-routeup/output b/tests/run-routeup/output new file mode 100644 index 0000000..9766475 --- /dev/null +++ b/tests/run-routeup/output @@ -0,0 +1 @@ +ok diff --git a/tests/run-routeup/runs b/tests/run-routeup/runs new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/tests/run-routeup/runs @@ -0,0 +1 @@ +2 diff --git a/tests/run-routeup/setup b/tests/run-routeup/setup new file mode 100755 index 0000000..c4afd68 --- /dev/null +++ b/tests/run-routeup/setup @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/run-routeup/subproc.sh b/tests/run-routeup/subproc.sh new file mode 100755 index 0000000..649a18e --- /dev/null +++ b/tests/run-routeup/subproc.sh @@ -0,0 +1,6 @@ +#!/bin/sh +. "$(dirname $0)"/../common.sh + +inc_counter "runs" +c=$(counter "runs") +[ $c -eq 2 ] && passed diff --git a/tests/run-routeup/teardown b/tests/run-routeup/teardown new file mode 100644 index 0000000..c4afd68 --- /dev/null +++ b/tests/run-routeup/teardown @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/subproc-retry/input b/tests/subproc-retry/input new file mode 100644 index 0000000..7898192 --- /dev/null +++ b/tests/subproc-retry/input @@ -0,0 +1 @@ +a diff --git a/tests/subproc-retry/output b/tests/subproc-retry/output new file mode 100644 index 0000000..0dae225 --- /dev/null +++ b/tests/subproc-retry/output @@ -0,0 +1,3 @@ +dying +dying +ok diff --git a/tests/subproc-retry/runs b/tests/subproc-retry/runs new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/tests/subproc-retry/runs @@ -0,0 +1 @@ +3 diff --git a/tests/subproc-retry/setup b/tests/subproc-retry/setup new file mode 100755 index 0000000..c4afd68 --- /dev/null +++ b/tests/subproc-retry/setup @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/subproc-retry/subproc.sh b/tests/subproc-retry/subproc.sh new file mode 100755 index 0000000..c725aa1 --- /dev/null +++ b/tests/subproc-retry/subproc.sh @@ -0,0 +1,10 @@ +#!/bin/sh +. "$(dirname $0)"/../common.sh + +inc_counter "runs" +if [ $(counter "runs") -lt 3 ]; then + echo "dying" + echo "$$" >> /tmp/pidz + exit 1 +fi +passed diff --git a/tests/subproc-retry/teardown b/tests/subproc-retry/teardown new file mode 100644 index 0000000..c4afd68 --- /dev/null +++ b/tests/subproc-retry/teardown @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")"/../common.sh + +reset_counter "runs" diff --git a/tests/wait-idle/input b/tests/wait-idle/input new file mode 100644 index 0000000..e69de29 diff --git a/tests/wait-idle/output b/tests/wait-idle/output new file mode 100644 index 0000000..e69de29 diff --git a/tests/wait-idle/subproc.sh b/tests/wait-idle/subproc.sh new file mode 100644 index 0000000..21f5871 --- /dev/null +++ b/tests/wait-idle/subproc.sh @@ -0,0 +1,7 @@ +#!/bin/sh +. "$(dirname $0)"/../common.sh + +inc_counter "runs" +c=$(counter "runs") +[ $c -eq 2 ] && failed +

1 0

[tlsdate/master] Merge pull request #117 from elly/integration-changelog
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 0bd0c2d1fea2f8ad6361b7912bc99a6a28b1dfa9 Merge: 55da3fa 4012e1f Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Mon Jul 8 14:29:22 2013 -0700 Merge pull request #117 from elly/integration-changelog Update CHANGELOG for integration tests. CHANGELOG | 1 + 1 file changed, 1 insertion(+)

1 0

[tlsdate/master] Update CHANGELOG for integration tests.
by ioerror＠torproject.org 31 Oct '13

31 Oct '13

commit 4012e1f2d6f6a9d2be3860cb3dcd18c0bf8c95e3 Author: elly <elly(a)leptoquark.net> Date: Mon Jul 8 14:01:35 2013 -0400 Update CHANGELOG for integration tests. --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index c408a15..e7c89f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -16,6 +16,7 @@ Extensive setup/install documentation is now present in INSTALL for most OSes Add DragonFly BSD 3.3 support Refactored subprocess watching. + Added integration tests. Run with ./run-tests 0.0.6 Mon 18 Feb, 2013 Ensure that tlsdate compiles with g++ by explicit casting rather than implicit casting by whatever compiler is compiling tlsdate.

1 0