Finally fixed nasty integration test bugs due to refactoring efforts.

Author: numbleroot

comm/receiver.go

@@ -507,8 +507,10 @@ func (recv *Receiver) ApplyStoredMsgs() {
 				// Calculate size of needed buffer.
 				bufferSize := logSize - curOffset
 
-				// Account for case when offset reached end of log file.
-				if logSize == curOffset {
+				// Account for case when offset reached end of log file
+				// or accidentally the current offset is bigger than the
+				// log file's size.
+				if logSize <= curOffset {
 
 					// Reset position to beginning of file.
 					_, err = recv.updLog.Seek(0, os.SEEK_SET)
@@ -562,7 +564,6 @@ func (recv *Receiver) ApplyStoredMsgs() {
 				// If not, set indicator to false.
 				if (msg.VClock[msg.Sender] != recv.vclock[msg.Sender]) &&
 					(msg.VClock[msg.Sender] != (recv.vclock[msg.Sender] + 1)) {
-					log.Printf("[comm.ApplyStoredMsgs] %s: not applying message because leap in causality and messages missing.\n", recv.name)
 					applyMsg = false
 				}
 
@@ -574,7 +575,6 @@ func (recv *Receiver) ApplyStoredMsgs() {
 						// and check if they do not exceed the locally stored
 						// values for these nodes.
 						if value > recv.vclock[node] {
-							log.Printf("[comm.ApplyStoredMsgs] %s: not applying message because other elements exceeded.\n", recv.name)
 							applyMsg = false
 							break
 						}
@@ -597,8 +597,6 @@ func (recv *Receiver) ApplyStoredMsgs() {
 
 						// Wait for done signal from node.
 						<-recv.doneCRDTUpdChan
-					} else {
-						log.Printf("[comm.ApplyStoredMsgs] %s: message was a duplicate, already seen.\n", recv.name)
 					}
 
 					for node, value := range msg.VClock {

distributor-commands_test.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"fmt"
 	"log"
-	"os"
 	"testing"
 
 	"crypto/tls"
@@ -67,29 +66,6 @@ var loginTests = []struct {
 
 // Functions
 
-func TestMain(m *testing.M) {
-
-	var err error
-
-	// Create needed test environment.
-	testEnv, err = utils.CreateTestEnv("./test-config.toml")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Run all nodes in background.
-	RunAllNodes(testEnv, "worker-1")
-
-	// Run all tests of this package.
-	success := m.Run()
-
-	// Tear down test setup.
-	TearDownNormalSetup(testEnv)
-
-	// Return with test return value.
-	os.Exit(success)
-}
-
 // TestCapability executes a black-box table test on the
 // implemented Capability() function.
 func TestCapability(t *testing.T) {

distributor_test.go

@@ -2,13 +2,44 @@ package main
 
 import (
 	"log"
+	"os"
+	"testing"
 	"time"
 
 	"github.com/numbleroot/pluto/imap"
 	"github.com/numbleroot/pluto/utils"
 )
 
-// Structs
+// Functions
+
+// TestMain executes initilization and teardown
+// code needed for all tests in package main.
+func TestMain(m *testing.M) {
+
+	var err error
+
+	// Create needed test environment.
+	testEnv, err = utils.CreateTestEnv("./test-config.toml")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Run all nodes in background.
+	RunAllNodes(testEnv, "worker-1")
+
+	// Run all tests of this package.
+	success := m.Run()
+
+	// Give background synchronization enough
+	// time to finish communication.
+	time.Sleep(15 * time.Second)
+
+	// Tear down test setup.
+	TearDownNormalSetup(testEnv)
+
+	// Return with test return value.
+	os.Exit(success)
+}
 
 // RunAllNodes runs all needed nodes for a proper multi-node
 // test setup in background. It also handles shutdown of these