From 012efd449affa2c1e986829fb77b8edd82073d35 Mon Sep 17 00:00:00 2001
From: John Shahid <jvshahid@gmail.com>
Date: Fri, 17 Jan 2014 13:40:58 -0500
Subject: [PATCH] test snapshot recovery from new peers in the cluster.

This is dependent on this pr https://github.com/goraft/raft/pull/154 the
test will fail without this change
---
 src/coordinator/coordinator_test.go | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/coordinator/coordinator_test.go b/src/coordinator/coordinator_test.go
index 7aa8b5a3f31..d6c8983db2e 100644
--- a/src/coordinator/coordinator_test.go
+++ b/src/coordinator/coordinator_test.go
@@ -1,7 +1,6 @@
 package coordinator
 
 import (
-	"common"
 	. "common"
 	"configuration"
 	"datastore"
@@ -168,17 +167,17 @@ func (self *CoordinatorSuite) TestCanSnapshot(c *C) {
 	server := startAndVerifyCluster(1, c)[0]
 	// defer clean(server)
 
-	path, port := server.path, server.port
+	path, port, name := server.path, server.port, server.name
 
 	for i := 0; i < 1000; i++ {
 		dbname := fmt.Sprintf("db%d", i)
 		server.CreateDatabase(dbname, uint8(1))
 		assertConfigContains(server.port, dbname, true, c)
 	}
-	size, err := common.GetFileSize(server.raftServer.LogPath())
+	size, err := GetFileSize(server.raftServer.LogPath())
 	c.Assert(err, IsNil)
 	server.forceLogCompaction()
-	newSize, err := common.GetFileSize(server.raftServer.LogPath())
+	newSize, err := GetFileSize(server.raftServer.LogPath())
 	c.Assert(err, IsNil)
 	c.Assert(newSize < size, Equals, true)
 	fmt.Printf("size of %s shrinked from %d to %d\n", server.raftServer.LogPath(), size, newSize)
@@ -190,13 +189,28 @@ func (self *CoordinatorSuite) TestCanSnapshot(c *C) {
 	os.RemoveAll(server.path)
 	server.path = path
 	server.port = port
+	server.name = name
 	// defer clean(server)
 	err = server.ListenAndServe()
 	c.Assert(err, IsNil)
+	time.Sleep(SERVER_STARTUP_TIME)
 	for i := 0; i < 1000; i++ {
 		dbname := fmt.Sprintf("db%d", i)
 		assertConfigContains(server.port, dbname, true, c)
 	}
+
+	// make another server join the cluster
+	server2 := newConfigAndServer(c)
+	defer clean(server2)
+	l, err := net.Listen("tcp4", ":0")
+	c.Assert(err, IsNil)
+	server2.config.SeedServers = []string{fmt.Sprintf("http://localhost:%d", server.port)}
+	server2.Serve(l)
+	time.Sleep(SERVER_STARTUP_TIME)
+	for i := 0; i < 1000; i++ {
+		dbname := fmt.Sprintf("db%d", i)
+		assertConfigContains(server2.port, dbname, true, c)
+	}
 }
 
 func (self *CoordinatorSuite) TestCanCreateCoordinatorsAndReplicate(c *C) {