diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-04-17 15:01:42 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-04-17 15:01:42 +1000 |
| commit | 3a3bac80b9084ead1b650714c01a8230ef3635f3 (patch) | |
| tree | 49657961b95ccc0170fef405ab08bcf450820dd6 | |
| parent | 6f9b29da22e088a77064eab3c3f4ad68e3ec1a93 (diff) | |
| download | samba-3a3bac80b9084ead1b650714c01a8230ef3635f3.tar.gz samba-3a3bac80b9084ead1b650714c01a8230ef3635f3.tar.xz samba-3a3bac80b9084ead1b650714c01a8230ef3635f3.zip | |
tidyups in test code
(This used to be ctdb commit 43061a4cf9b0995ebe6c86e27f7fc3aacb7bb23e)
| -rw-r--r-- | ctdb/tests/ctdb_fetch.c | 4 | ||||
| -rwxr-xr-x | ctdb/tests/test.sh | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ctdb/tests/ctdb_fetch.c b/ctdb/tests/ctdb_fetch.c index a292dfb443..33396fe4f3 100644 --- a/ctdb/tests/ctdb_fetch.c +++ b/ctdb/tests/ctdb_fetch.c @@ -63,8 +63,8 @@ static void bench_fetch_1node(struct ctdb_context *ctdb) int dest, ret; struct ctdb_record_handle *h; - key.dptr = discard_const("testkey"); - key.dsize = strlen((const char *)key.dptr); + key.dptr = discard_const(TESTKEY); + key.dsize = strlen(TESTKEY); ctdb_db = ctdb_db_handle(ctdb, "test.tdb"); diff --git a/ctdb/tests/test.sh b/ctdb/tests/test.sh index de7d8a342f..f119ad5b1b 100755 --- a/ctdb/tests/test.sh +++ b/ctdb/tests/test.sh @@ -5,7 +5,7 @@ killall -q ctdb_test echo "Trying 2 nodes" bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.1:9001 & -bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.2:9001 & +bin/ctdb_test --nlist tests/nodes.txt --listen 127.0.0.2:9001 sleep 3 killall ctdb_test @@ -14,9 +14,7 @@ echo "Trying 4 nodes" bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.1:9001 & bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.2:9001 & bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.3:9001 & -bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.4:9001 & +bin/ctdb_test --nlist tests/4nodes.txt --listen 127.0.0.4:9001 sleep 3 killall ctdb_test - - |