Make tests use .localhost.localdomain hostnames

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

.travis.yml

@@ -1,6 +1,5 @@
 language: go
-# We modify /etc/hosts
-sudo: true
+sudo: false
 git:
   # We need the full repo for the metatest
   depth: false
@@ -23,8 +22,6 @@ go_import_path: repospanner.org/repospanner
 # In no way would I suggest doing curl | sh normally.... But it's not my environment
 install:
 - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-before_script:
-- echo "127.0.0.1   node1.regiona.repospanner.local node2.regiona.repospanner.local node3.regiona.repospanner.local" | sudo tee -a /etc/hosts
 script:
 - dep ensure
 - ./build.sh -tags prof

README.md

@@ -87,9 +87,9 @@ Or, again, start the `repospanner.service` unit file.
 Repository access
 -----------------
 
-After this, the service will be available on https://<node.fqdn>/ 
-    
-For git repo pull/push, add a /repo/<repo-name>.git.  
+After this, the service will be available on https://<node.fqdn>/
+
+For git repo pull/push, add a /repo/<repo-name>.git.
 Example clone command for default https port on tcp/443 and repo name being "test"
 
 ```
@@ -120,11 +120,7 @@ install the protobuf compiler:
 
 Then run `go generate ./...` to regenerate the built files.
 
-To run the full test suite, first make sure you have a /etc/hosts entry with:
-
-    127.0.0.1	node1.regiona.repospanner.local node2.regiona.repospanner.local node3.regiona.repospanner.local
-
-Then to actually run all tests, run from the main directory:
+To run the full test suite, run from the main directory:
 
     $ go test ./...
 

functional_tests/base.go

@@ -59,8 +59,8 @@ func setBinaryPaths(t tester) {
 }
 
 const (
-	testCluster = "repospanner.local"
-	testRegion  = "regiona"
+	testCluster = "localdomain"
+	testRegion  = "localhost"
 
 	insecureKeysFlag       = "--very-insecure-weak-keys"
 	skipNameConstraintFlag = "--no-name-constraint"
@@ -630,7 +630,7 @@ func createTestConfig(t tester, node string, nodenr nodeNrType, extras ...string
 	examplecfg = strings.Replace(
 		examplecfg,
 		"/ca/public.",
-		"/ca/nodea.regiona.",
+		"/ca/nodea.localhost.",
 		-1,
 	)
 	examplecfg = strings.Replace(
@@ -651,6 +651,12 @@ func createTestConfig(t tester, node string, nodenr nodeNrType, extras ...string
 		node,
 		-1,
 	)
+	examplecfg = strings.Replace(
+		examplecfg,
+		"regiona",
+		testRegion,
+		-1,
+	)
 	examplecfg = strings.Replace(
 		examplecfg,
 		"paranoid: false",

functional_tests/multi_node_test.go

@@ -8,13 +8,13 @@ import (
 func nodeInfoVerification(t *testing.T, node nodeNrType) {
 	nodeinfo, _ := _runCommand(t, node.Name(), "admin", "nodestatus", "--json")
 	t.Log("Node info: ", nodeinfo)
-	if !strings.Contains(nodeinfo, "https://node1.regiona.repospanner.local:1444") {
+	if !strings.Contains(nodeinfo, "https://node1.localhost.localdomain:1444") {
 		t.Error("Node A url not in node info")
 	}
-	if !strings.Contains(nodeinfo, "https://node2.regiona.repospanner.local:2444") {
+	if !strings.Contains(nodeinfo, "https://node2.localhost.localdomain:2444") {
 		t.Error("Node B url not in node info")
 	}
-	if !strings.Contains(nodeinfo, "https://node3.regiona.repospanner.local:3444") {
+	if !strings.Contains(nodeinfo, "https://node3.localhost.localdomain:3444") {
 		t.Error("Node C url not in node info")
 	}
 }