diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-02-17 17:25:57 +0000 |
|---|---|---|
| committer | <> | 2015-03-17 16:26:24 +0000 |
| commit | 780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch) | |
| tree | 598f8b9fa431b228d29897e798de4ac0c1d3d970 /test/tcl/rep075.tcl | |
| parent | 7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff) | |
| download | berkeleydb-master.tar.gz | |
Diffstat (limited to 'test/tcl/rep075.tcl')
| -rw-r--r-- | test/tcl/rep075.tcl | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/test/tcl/rep075.tcl b/test/tcl/rep075.tcl index 99f4d68c..14f67181 100644 --- a/test/tcl/rep075.tcl +++ b/test/tcl/rep075.tcl @@ -1,6 +1,6 @@ # See the file LICENSE for redistribution information. # -# Copyright (c) 2001, 2012 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2015 Oracle and/or its affiliates. All rights reserved. # # $Id$ # @@ -160,6 +160,13 @@ proc rep075_sub { method tnum logset prep op after largs } { -home $clientdir2 -rep_transport \[list 3 replsend\]" set env2 [eval $cl2_envcmd -rep_client] set clientenv2 $env2 + # + # Give env2 a shorter rerequest time because, unlike env1, it is not + # explicitly restarted for some prep options. In these cases it must + # rely on rerequests to get all log records, but on faster platforms + # the test may complete before the default rerequest time has passed. + # + $clientenv2 rep_request 4000 128000 error_check_good client_env [is_valid_env $env2] TRUE set omethod [convert_method $method] @@ -509,8 +516,8 @@ proc rep075_sub { method tnum logset prep op after largs } { # Verify whether or not the key exists in the databases both # on the client and the master. # - puts "\tRep$tnum.d: Verify prepared data." foreach e $envlist { + puts "\tRep$tnum.d: Verify prepared data for env ($e)." set env [lindex $e 0] if { $databases_in_memory } { set db1 [eval {berkdb_open_noerr -env $env\ @@ -528,14 +535,14 @@ proc rep075_sub { method tnum logset prep op after largs } { set k1 [$db1 get $key] set k2 [$db2 get $key] if { $op1 == "commit" } { - error_check_good key [llength $k1] 1 + error_check_good key1 [llength $k1] 1 } else { - error_check_good key [llength $k1] 0 + error_check_good key1 [llength $k1] 0 } if { $op2 == "commit" } { - error_check_good key [llength $k2] 1 + error_check_good key2 [llength $k2] 1 } else { - error_check_good key [llength $k2] 0 + error_check_good key2 [llength $k2] 0 } error_check_good db_close [$db1 close] 0 |