From 9a37aa39697494692e0a4a13fb8723b1d15c9599 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 22 Mar 2023 09:42:10 +0100 Subject: [PATCH] ctdb:tests: Fix code spelling Best reviewed with: `git show --word-diff` Signed-off-by: Andreas Schneider Reviewed-by: Martin Schwenke --- ctdb/tests/CLUSTER/complex/32_cifs_tickle.sh | 2 +- .../INTEGRATION/database/recovery.011.continue.sh | 2 +- .../simple/cluster.015.reclock_remove_lock.sh | 2 +- ctdb/tests/README | 2 +- ctdb/tests/UNIT/cunit/cluster_mutex_002.sh | 2 +- ctdb/tests/UNIT/eventscripts/stubs/rpcinfo | 2 +- ctdb/tests/UNIT/eventscripts/stubs/testparm | 2 +- ctdb/tests/local_daemons.sh | 2 +- ctdb/tests/src/ctdb_io_test.c | 2 +- ctdb/tests/src/db_test_tool.c | 2 +- ctdb/tests/src/event_script_test.c | 2 +- ctdb/tests/src/fake_ctdbd.c | 2 +- ctdb/tests/src/rb_test.c | 12 ++++++------ ctdb/tests/src/test_mutex_raw.c | 2 +- ctdb/tests/src/tmon_ping_test.c | 2 +- ctdb/tests/src/tmon_test.c | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ctdb/tests/CLUSTER/complex/32_cifs_tickle.sh b/ctdb/tests/CLUSTER/complex/32_cifs_tickle.sh index c5b583d4cc3..78b894808b7 100755 --- a/ctdb/tests/CLUSTER/complex/32_cifs_tickle.sh +++ b/ctdb/tests/CLUSTER/complex/32_cifs_tickle.sh @@ -54,7 +54,7 @@ echo "Checking if CIFS connection is tracked by CTDB on test node..." wait_until 10 check_tickles $test_node $test_ip $test_port $src_socket # This is almost immediate. However, it is sent between nodes -# asynchonously, so it is worth checking... +# asynchronously, so it is worth checking... echo "Wait until CIFS connection is tracked by CTDB on all nodes..." try_command_on_node $test_node "$CTDB listnodes | wc -l" numnodes="$out" diff --git a/ctdb/tests/INTEGRATION/database/recovery.011.continue.sh b/ctdb/tests/INTEGRATION/database/recovery.011.continue.sh index 3376e062bed..995b2822981 100755 --- a/ctdb/tests/INTEGRATION/database/recovery.011.continue.sh +++ b/ctdb/tests/INTEGRATION/database/recovery.011.continue.sh @@ -44,7 +44,7 @@ echo "store key(test1) data(newvalue1)" echo '"test1" "newvalue1"' | try_command_on_node -i 0 $CTDB ptrans "$TESTDB" # Continue node -echo "contine node 1" +echo "continue node 1" try_command_on_node 1 $CTDB continue wait_until_node_has_status 1 notstopped diff --git a/ctdb/tests/INTEGRATION/simple/cluster.015.reclock_remove_lock.sh b/ctdb/tests/INTEGRATION/simple/cluster.015.reclock_remove_lock.sh index 9088a800498..2bb058cbc21 100755 --- a/ctdb/tests/INTEGRATION/simple/cluster.015.reclock_remove_lock.sh +++ b/ctdb/tests/INTEGRATION/simple/cluster.015.reclock_remove_lock.sh @@ -62,7 +62,7 @@ echo "Remove recovery lock" rm "$reclock" echo -# This will mean an election has taken place and a recovery has occured +# This will mean an election has taken place and a recovery has occurred wait_until_generation_has_changed "$test_node" # shellcheck disable=SC2154 diff --git a/ctdb/tests/README b/ctdb/tests/README index eaca954b758..80f3311b684 100644 --- a/ctdb/tests/README +++ b/ctdb/tests/README @@ -130,7 +130,7 @@ Test and debugging variable options CTDB_TEST_SAMBA_VERSION=VERSION - VERSION is a 32-bit number containg the Samba major + VERSION is a 32-bit number containing the Samba major version in the most significant 16 bits and the minor version in the least significant 16 bits. This can be used to test CTDB's checking of incompatible versions diff --git a/ctdb/tests/UNIT/cunit/cluster_mutex_002.sh b/ctdb/tests/UNIT/cunit/cluster_mutex_002.sh index 069ee096d1a..c672eaf87ee 100755 --- a/ctdb/tests/UNIT/cunit/cluster_mutex_002.sh +++ b/ctdb/tests/UNIT/cunit/cluster_mutex_002.sh @@ -123,7 +123,7 @@ EOF unit_test cluster_mutex_test lock-io-timeout "$helper 5 7" "$lockfile" 1 2 -test_case "Recheck on, ping on, child waits, child blocks causing ping timout" +test_case "Recheck on, ping on, child waits, child blocks causing ping timeout" ok <> 1) - 1); /* - * the packet is still incomplete and connot be processed + * the packet is still incomplete and cannot be processed * but the packet data had to be moved in the buffer in order * to fetch the new 199 bytes -> offset must be 0 now. */ diff --git a/ctdb/tests/src/db_test_tool.c b/ctdb/tests/src/db_test_tool.c index 7ac6b030740..e99da3c27b9 100644 --- a/ctdb/tests/src/db_test_tool.c +++ b/ctdb/tests/src/db_test_tool.c @@ -63,7 +63,7 @@ struct db_test_tool_context { }; /* - * If this is ever consolodated into a larger test tool then these + * If this is ever consolidated into a larger test tool then these * forward declarations can be moved to an include file */ int db_test_tool_init(TALLOC_CTX *mem_ctx, diff --git a/ctdb/tests/src/event_script_test.c b/ctdb/tests/src/event_script_test.c index a78e4005828..f06725a96d0 100644 --- a/ctdb/tests/src/event_script_test.c +++ b/ctdb/tests/src/event_script_test.c @@ -39,7 +39,7 @@ static void usage(const char *prog) " %s chmod enable \n", prog); fprintf(stderr, - " %s chmod diable \n", + " %s chmod disable \n", prog); } diff --git a/ctdb/tests/src/fake_ctdbd.c b/ctdb/tests/src/fake_ctdbd.c index a04ad853306..0d430a37834 100644 --- a/ctdb/tests/src/fake_ctdbd.c +++ b/ctdb/tests/src/fake_ctdbd.c @@ -159,7 +159,7 @@ static struct node_map *nodemap_init(TALLOC_CTX *mem_ctx) * [RECMASTER] [CURRENT] [CAPABILITIES] * EOF or a blank line terminates input. * - * By default, capablities for each node are + * By default, capabilities for each node are * CTDB_CAP_RECMASTER|CTDB_CAP_LMASTER. These 2 * capabilities can be faked off by adding, for example, * -CTDB_CAP_RECMASTER. diff --git a/ctdb/tests/src/rb_test.c b/ctdb/tests/src/rb_test.c index 7dc062915c4..d712c9a80ad 100644 --- a/ctdb/tests/src/rb_test.c +++ b/ctdb/tests/src/rb_test.c @@ -1,4 +1,4 @@ -/* +/* simple rb test tool Copyright (C) Ronnie Sahlberg 2007 @@ -38,7 +38,7 @@ static void start_timer(void) static double end_timer(void) { gettimeofday(&tp2,NULL); - return (tp2.tv_sec + (tp2.tv_usec*1.0e-6)) - + return (tp2.tv_sec + (tp2.tv_usec*1.0e-6)) - (tp1.tv_sec + (tp1.tv_usec*1.0e-6)); } @@ -76,7 +76,7 @@ static int random_traverse(void *p, void *d) return 0; } -static uint32_t calc_checksum = 0; +static uint32_t calc_checksum = 0; static int traverse_checksum(void *p, void *d) { int i,j,k; @@ -262,8 +262,8 @@ int main(int argc, const char *argv[]) i=0; start_timer(); checksum = 0; - /* add and delete nodes from a 3 level tree fro 60 seconds. - each time a node is added or deleted, traverse the tree and + /* Add and delete nodes from a 3 level tree for 60 seconds. + Each time a node is added or deleted, traverse the tree and compute a checksum over the data stored in the tree and compare this with a checksum we keep which contains what the checksum should be */ @@ -286,7 +286,7 @@ int main(int argc, const char *argv[]) } } else { if ((str=trbt_lookuparray32(tree, 3, key)) != NULL) { - /* this node does exist in the tree, delete + /* this node does exist in the tree, delete it and update the checksum accordingly */ talloc_free(str); diff --git a/ctdb/tests/src/test_mutex_raw.c b/ctdb/tests/src/test_mutex_raw.c index 926a5251b7a..8ebf77e8a17 100644 --- a/ctdb/tests/src/test_mutex_raw.c +++ b/ctdb/tests/src/test_mutex_raw.c @@ -52,7 +52,7 @@ * This creates 20 processes, 10 at normal priority and 10 at realtime * priority, all taking the lock, being killed and recovering the lock. * - * If while runnig (c) the processes block, it might mean that a futex wakeup + * If while running (c) the processes block, it might mean that a futex wakeup * was lost, or that the handoff of EOWNERDEAD did not happen correctly. In * either case you can debug the resulting mutex like this: * diff --git a/ctdb/tests/src/tmon_ping_test.c b/ctdb/tests/src/tmon_ping_test.c index 491792db2d7..c0c0aae4e86 100644 --- a/ctdb/tests/src/tmon_ping_test.c +++ b/ctdb/tests/src/tmon_ping_test.c @@ -297,7 +297,7 @@ static void test(unsigned long parent_timeout, parent_blocking_sleep_time); assert(ret == parent_result); - /* Close to mimick exit, so child status can be checked below */ + /* Close to mimic exit, so child status can be checked below */ close(fd[0]); /* Abort if child failed */ diff --git a/ctdb/tests/src/tmon_test.c b/ctdb/tests/src/tmon_test.c index fb1f5eb9d30..10eaa7244a8 100644 --- a/ctdb/tests/src/tmon_test.c +++ b/ctdb/tests/src/tmon_test.c @@ -353,7 +353,7 @@ static void test(const char *write_data, } fflush(stdout); - /* Close to mimick exit, so child status can be checked below */ + /* Close to mimic exit, so child status can be checked below */ close(fd[1]); waitpid(pid, &wstatus, 0);