diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-01-10 12:54:26 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-01-10 12:54:26 -0800 |
| commit | 15b619e29d20708d2ce6946f1c5ec9841c4c822b (patch) | |
| tree | 259eda6004f91f6fbc68f0995f622839e97ee4bf /tests/ovsdb-server.at | |
| parent | a87c35f1794474ed9d7696bdb762148dc65b0adb (diff) | |
| download | openvswitch-15b619e29d20708d2ce6946f1c5ec9841c4c822b.tar.gz | |
tests: Fix Y2011 bug in testsuite.
The tests have been failing for a few days now, because the PKI expired a
few days into 2011. This commit instead generates the PKI at "make check"
time, which has the additional benefit of getting some test exposure for
the ovs-pki program.
Reported-by: Aaron M. Ucko <ucko@debian.org>
CC: 609506@bugs.debian.org
Diffstat (limited to 'tests/ovsdb-server.at')
| -rw-r--r-- | tests/ovsdb-server.at | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index 23125ab46..c9168f8df 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -106,7 +106,7 @@ AT_KEYWORDS([ovsdb server positive ssl $5]) AT_SKIP_IF([test "$HAVE_OPENSSL" = no]) AT_SKIP_IF([test "x$RANDOM" = x]) SSL_PORT=`expr 32767 + \( $RANDOM % 32767 \)` -PKIDIR=$abs_top_srcdir/tests +PKIDIR=$abs_top_builddir/tests AT_SKIP_IF([expr "$PKIDIR" : ".*[ '\"
\\]"]) AT_DATA([schema], @@ -299,7 +299,7 @@ m4_define([OVSDB_CHECK_EXECUTION], AT_DATA([schema], [$2 ]) SSL_PORT=`expr 32767 + \( $RANDOM % 32767 \)` - PKIDIR=$abs_top_srcdir/tests + PKIDIR=$abs_top_builddir/tests AT_CHECK([ovsdb-tool create db schema], [0], [stdout], [ignore]) AT_CHECK([ovsdb-server --detach --pidfile=$PWD/pid --private-key=$PKIDIR/testpki-privkey2.pem --certificate=$PKIDIR/testpki-cert2.pem --ca-cert=$PKIDIR/testpki-cacert.pem --remote=pssl:$SSL_PORT:127.0.0.1 --unixctl=$PWD/unixctl db], [0], [ignore], [ignore]) m4_foreach([txn], [$3], |