Merge pull request #74 from kmerenkov/issue_620

[redis.git] / tests / integration / replication.tcl

diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl
index 227356b24de6399f928e305058f942728d46e2e6..0a1cd409fed067ae6a7e5c6b3bb61732b7f9feee 100644 (file)
--- a/tests/integration/replication.tcl
+++ b/tests/integration/replication.tcl
@@ -23,44 +23,6 @@ start_server {tags {"repl"}} {
             after 1000
             assert_equal [r debug digest] [r -1 debug digest]
         }
-
-        test {MASTER and SLAVE dataset should be identical after complex ops} {
-            createComplexDataset r 10000
-            after 500
-            if {[r debug digest] ne [r -1 debug digest]} {
-                set csv1 [csvdump r]
-                set csv2 [csvdump {r -1}]
-                set fd [open /tmp/repldump1.txt w]
-                puts -nonewline $fd $csv1
-                close $fd
-                set fd [open /tmp/repldump2.txt w]
-                puts -nonewline $fd $csv2
-                close $fd
-                puts "Master - Slave inconsistency"
-                puts "Run diff -u against /tmp/repldump*.txt for more info"
-            }
-            assert_equal [r debug digest] [r -1 debug digest]
-        }
-
-        test {MASTER and SLAVE consistency with expire} {
-            createComplexDataset r 50000 useexpire
-            after 4000 ;# Make sure everything expired before taking the digest
-            r keys *   ;# Force DEL syntesizing to slave
-            after 1000 ;# Wait another second. Now everything should be fine.
-            if {[r debug digest] ne [r -1 debug digest]} {
-                set csv1 [csvdump r]
-                set csv2 [csvdump {r -1}]
-                set fd [open /tmp/repldump1.txt w]
-                puts -nonewline $fd $csv1
-                close $fd
-                set fd [open /tmp/repldump2.txt w]
-                puts -nonewline $fd $csv2
-                close $fd
-                puts "Master - Slave inconsistency"
-                puts "Run diff -u against /tmp/repldump*.txt for more info"
-            }
-            assert_equal [r debug digest] [r -1 debug digest]
-        }
     }
 }
 
@@ -92,6 +54,7 @@ start_server {tags {"repl"}} {
         
         test {SET on the master should immediately propagate} {
             r -1 set mykey bar
+            if {$::valgrind} {after 2000}
             r  0 get mykey
         } {bar}
     }