From 532cd0e2ce7f7ff6f0553c446fe3bad76181e049 Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Mon, 16 Nov 2015 22:34:55 -0800
Subject: [PATCH] Fix tests without skipping

---
 socketserver/server/handlecore.go         |  4 +++-
 socketserver/server/subscriptions_test.go | 22 +++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go
index e19f93e4..0e0decb8 100644
--- a/socketserver/server/handlecore.go
+++ b/socketserver/server/handlecore.go
@@ -88,12 +88,14 @@ func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) {
 	go ircConnection()
 }
 
+const TwitchDotTv = "http://www.twitch.tv"
+
 // SocketUpgrader is the websocket.Upgrader currently in use.
 var SocketUpgrader = websocket.Upgrader{
 	ReadBufferSize:  1024,
 	WriteBufferSize: 1024,
 	CheckOrigin: func(r *http.Request) bool {
-		return r.Header.Get("Origin") == "http://www.twitch.tv"
+		return r.Header.Get("Origin") == TwitchDotTv
 	},
 }
 
diff --git a/socketserver/server/subscriptions_test.go b/socketserver/server/subscriptions_test.go
index 9a31b95c..f404654e 100644
--- a/socketserver/server/subscriptions_test.go
+++ b/socketserver/server/subscriptions_test.go
@@ -128,8 +128,8 @@ func TGetUrls(testserver *httptest.Server) TURLs {
 	return TURLs{
 		Websocket:  fmt.Sprintf("ws://%s/", addr),
 		Origin:     fmt.Sprintf("http://%s", addr),
-		PubMsg:     fmt.Sprintf("http://%s/pub_msg", addr),
-		SavePubMsg: fmt.Sprintf("http://%s/update_and_pub", addr),
+		PubMsg:     fmt.Sprintf("http://%s/uncached_pub", addr),
+		SavePubMsg: fmt.Sprintf("http://%s/cached_pub", addr),
 	}
 }
 
@@ -204,6 +204,9 @@ func TestSubscriptionAndPublish(t *testing.T) {
 	var resp *http.Response
 	var err error
 
+	var headers http.Header = make(http.Header)
+	headers.Set("Origin", TwitchDotTv)
+
 	// client 1: sub ch1, ch2
 	// client 2: sub ch1, ch3
 	// client 3: sub none
@@ -213,10 +216,8 @@ func TestSubscriptionAndPublish(t *testing.T) {
 	// msg 3: chEmpty
 	// msg 4: global
 
-	t.SkipNow()
-
 	// Client 1
-	conn, resp, err = websocket.DefaultDialer.Dial(urls.Websocket, http.Header{})
+	conn, resp, err = websocket.DefaultDialer.Dial(urls.Websocket, headers)
 	if err != nil {
 		t.Error(err)
 		return
@@ -245,7 +246,7 @@ func TestSubscriptionAndPublish(t *testing.T) {
 	}(conn)
 
 	// Client 2
-	conn, resp, err = websocket.DefaultDialer.Dial(urls.Websocket, http.Header{})
+	conn, resp, err = websocket.DefaultDialer.Dial(urls.Websocket, headers)
 	if err != nil {
 		t.Error(err)
 		return
@@ -274,7 +275,7 @@ func TestSubscriptionAndPublish(t *testing.T) {
 	}(conn)
 
 	// Client 3
-	conn, resp, err = websocket.DefaultDialer.Dial(urls.Websocket, http.Header{})
+	conn, resp, err = websocket.DefaultDialer.Dial(urls.Websocket, headers)
 	if err != nil {
 		t.Error(err)
 		return
@@ -346,7 +347,7 @@ func TestSubscriptionAndPublish(t *testing.T) {
 	}
 
 	// Start client 4
-	conn, resp, err = websocket.DefaultDialer.Dial(urls.Websocket, http.Header{})
+	conn, resp, err = websocket.DefaultDialer.Dial(urls.Websocket, headers)
 	if err != nil {
 		t.Error(err)
 		return
@@ -407,9 +408,12 @@ func BenchmarkUserSubscriptionSinglePublish(b *testing.B) {
 	TSetup(&server, &urls)
 	defer unsubscribeAllClients()
 
+	var headers http.Header = make(http.Header)
+	headers.Set("Origin", TwitchDotTv)
+
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		conn, _, err := websocket.DefaultDialer.Dial(urls.Websocket, http.Header{})
+		conn, _, err := websocket.DefaultDialer.Dial(urls.Websocket, headers)
 		if err != nil {
 			b.Error(err)
 			break