[SCM] CTDB repository - branch master updated - ctdb-1.0.91-11-g9b206d9

[Ronnie Sahlberg]

The branch, master has been updated
       via  9b206d96da3341836cc25aee5693f551f6f3a80e (commit)
       via  23ae9e9863ea90c6fb3f105403fd098041fa73f4 (commit)
       via  4e9a3a5dc232bac12ab387ea0cf4f1b279bed5c1 (commit)
       via  d1d370033d5007ad1c2c34cd9eeac53001f4b13e (commit)
      from  b77e4698e7f83443243965f93b84237f2903cd46 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9b206d96da3341836cc25aee5693f551f6f3a80e
Merge: 4e9a3a5dc232bac12ab387ea0cf4f1b279bed5c1 23ae9e9863ea90c6fb3f105403fd098041fa73f4
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Oct 1 15:46:01 2009 +1000

    Merge commit 'martins/master'

commit 23ae9e9863ea90c6fb3f105403fd098041fa73f4
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Oct 1 15:39:09 2009 +1000

    Test suite: The ctdb ping test should allow time to go backwards.
    
    Time can actually go backwards during this test if ntpd happens to
    adjust it little bit.  So we should cope...
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit 4e9a3a5dc232bac12ab387ea0cf4f1b279bed5c1
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Oct 1 14:53:35 2009 +1000

    dont exit on a commit failure

commit d1d370033d5007ad1c2c34cd9eeac53001f4b13e
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Oct 1 14:51:32 2009 +1000

    Revert "Revert "allow the transaction commit to fail""
    
    This reverts commit 74e416108df6934f45ca646d709785dd76ab3c35.

-----------------------------------------------------------------------

Summary of changes:
 tests/simple/09_ctdb_ping.sh |    2 +-
 tests/src/ctdb_persistent.c  |    2 +-
 tests/src/ctdb_transaction.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tests/simple/09_ctdb_ping.sh b/tests/simple/09_ctdb_ping.sh
index dcc5edf..6ca50d4 100755
--- a/tests/simple/09_ctdb_ping.sh
+++ b/tests/simple/09_ctdb_ping.sh
@@ -42,7 +42,7 @@ try_command_on_node -v 0 "$CTDB ping -n 1"
 
 sanity_check_output \
     1 \
-    '^response from 1 time=[.0-9]+ sec[[:space:]]+\([[:digit:]]+ clients\)$' \
+    '^response from 1 time=-?[.0-9]+ sec[[:space:]]+\([[:digit:]]+ clients\)$' \
     "$out"
 
 try_command_on_node -v 0 "$CTDB shutdown -n 1"
diff --git a/tests/src/ctdb_persistent.c b/tests/src/ctdb_persistent.c
index 8110ce1..4a50aa7 100644
--- a/tests/src/ctdb_persistent.c
+++ b/tests/src/ctdb_persistent.c
@@ -164,7 +164,7 @@ static void test_store_records(struct ctdb_context *ctdb, struct event_context *
 		ret = ctdb_transaction_commit(h);
 		if (ret != 0) {
 			DEBUG(DEBUG_ERR,("Failed to commit transaction\n"));
-			exit(1);
+			//exit(1);
 		}
 
 		/* store the counters and verify that they are sane */
diff --git a/tests/src/ctdb_transaction.c b/tests/src/ctdb_transaction.c
index c747e1a..fdd2e89 100644
--- a/tests/src/ctdb_transaction.c
+++ b/tests/src/ctdb_transaction.c
@@ -197,7 +197,7 @@ static void test_store_records(struct ctdb_context *ctdb, struct event_context *
 			ret = ctdb_transaction_commit(h);
 			if (ret != 0) {
 				DEBUG(DEBUG_ERR,("Failed to commit transaction\n"));
-				exit(1);
+				//exit(1);
 			}
 			if (verbose) printf("transaction committed\n");
 		} else {


-- 
CTDB repository