Merge pull request #292 from weaveworks/test-refactoring

Test refactoring

bin/lint

@@ -25,6 +25,30 @@ function spell_check {
 	return $lint_result
 }
 
+function test_mismatch {
+	filename="$1"
+	package=$(grep '^package ' $filename | awk '{print $2}')
+	local lint_result=0
+
+	if [[ $package == "main" ]]; then
+		continue # in package main, all bets are off
+	fi
+
+	if [[ $filename == *"_internal_test.go" ]]; then
+		if [[ $package == *"_test" ]]; then
+			lint_result=1
+			echo "${filename}: should not be part of a _test package"
+		fi
+	else
+		if [[ ! $package == *"_test" ]]; then
+			lint_result=1
+			echo "${filename}: should be part of a _test package"
+		fi
+	fi
+
+	return $lint_result
+}
+
 function lint_go {
 	filename="$1"
 	local lint_result=0
@@ -81,6 +105,10 @@ function lint {
 		;;
 	esac
 
+	if [[ $filename == *"_test.go" ]]; then
+		test_mismatch "${filename}" || lint_result=1
+	fi
+
 	spell_check "${filename}" || lint_result=1
 
 	return $lint_result

experimental/_integration/easy_test.go

@@ -1,4 +1,4 @@
-package integration
+package integration_test
 
 import (
 	"encoding/json"

report/merge.go

@@ -1,8 +1,7 @@
 package report
 
-// Merge() functions for all topology datatypes.
-// The general semantics are that the receiver is modified, and what's merged
-// in isn't.
+// Merge functions for all topology datatypes. The general semantics are that
+// the receiver is modified, and what's merged in isn't.
 
 // Merge merges another Report into the receiver.
 func (r *Report) Merge(other Report) {
@@ -38,9 +37,9 @@ func (m *NodeMetadatas) Merge(other NodeMetadatas) {
 	}
 }
 
-// Merge merges another EdgeMetadatas into the receiver.
-// If other is from another probe this is the union of both metadatas. Keys
-// present in both are summed.
+// Merge merges another EdgeMetadatas into the receiver. If other is from
+// another probe this is the union of both metadatas. Keys present in both are
+// summed.
 func (e *EdgeMetadatas) Merge(other EdgeMetadatas) {
 	for id, edgemeta := range other {
 		local := (*e)[id]
@@ -65,8 +64,8 @@ func (m *EdgeMetadata) Merge(other EdgeMetadata) {
 	}
 }
 
-// Flatten sums two EdgeMetadatas, their 'Window's should be the same size. The
-// two EdgeMetadatas should represent different edges at the same time.
+// Flatten sums two EdgeMetadatas. Their windows should be the same duration;
+// they should represent different edges at the same time.
 func (m *EdgeMetadata) Flatten(other EdgeMetadata) {
 	if other.WithBytes {
 		m.WithBytes = true