From 410504e069d37c522dca6bf820e9fc4cea2de871 Mon Sep 17 00:00:00 2001
From: Horus3
Date: Fri, 20 Mar 2015 17:30:11 +0100
Subject: Check if domain points to mail server. Add http handler to create a
 new entry.

---
 domain_test.go | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'domain_test.go')

diff --git a/domain_test.go b/domain_test.go
index 456d301..20d927a 100644
--- a/domain_test.go
+++ b/domain_test.go
@@ -1,13 +1,10 @@
 package main
 
 import (
-	"flag"
 	"os"
 	"testing"
 )
 
-var testExternal = flag.Bool("external", false, "allow use of external networks during long test")
-
 func TestCreateDomain(t *testing.T) {
 	d := VirtualDomain{Name: "example.org"}
 	if !d.CreateDomain() {
@@ -27,20 +24,26 @@ func TestDomainExists(t *testing.T) {
 }
 
 func TestValidateDomain(t *testing.T) {
+	if testing.Short() || !*testExternal {
+		t.Skip("Skipping test to avoid external network.")
+	}
 	d := VirtualDomain{Name: "blablabla"}
-	if d.ValidateDomain() {
+	if d.ValidateDomain("blablabla") {
 		t.Fatal(d.Name + " is not a valid domain.")
 	}
 	d.Name = "dfalsdf.adfjalf.example.org"
-	if d.ValidateDomain() {
+	if d.ValidateDomain("dfalsdf.adfjalf.example.org") {
 		t.Fatal("'" + d.Name + "' is not a valid domain.")
 	}
 	d.Name = "https://google.com"
-	if d.ValidateDomain() {
+	if d.ValidateDomain("https://google.com") {
 		t.Fatal("'" + d.Name + "' is not a valid domain.")
 	}
 	d.Name = "google.com"
-	if !d.ValidateDomain() {
+	if d.ValidateDomain("wikipedia.de") {
+		t.Fatal("'" + d.Name + "' and wikipedia.de do not share IPs.")
+	}
+	if !d.ValidateDomain("google.com") {
 		t.Fatal("'" + d.Name + "' is a valid domain.")
 	}
 }
-- 
cgit v1.2.3