Alibaba100 20180709

ctrd/image_proxy_util_test.go

@@ -1,15 +1,68 @@
 package ctrd
 
-import "testing"
+import (
+	"testing"
+	"net/url"
+)
 
 func TestHasPort(t *testing.T) {
 	// TODO
 }
 
 func TestCanonicalAddr(t *testing.T) {
-	// TODO
+
+	tests := []struct {
+		name string
+		url  url.URL
+		want bool
+	}{
+		{url: url.URL{Scheme: string("http"), Host: string("localhost")}, want: true},
+		{url: url.URL{Scheme: string("http"), Host: string("192.168.1.1")}, want: true},
+		{url: url.URL{Scheme: string("http"), Host: string("127.0.0.1")}, want: true},
+		{url: url.URL{Scheme: string("https"), Host: string("127.0.0.1")}, want: true},
+		{url: url.URL{Scheme: string("x"), Host: string("127.0.0.1:8081")}, want: true},
+	}
+	portMap = map[string]string{
+		"http":   "80",
+		"https":  "443",
+		"socks5": "1080",
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			got := canonicalAddr(&test.url)
+			//if url.URL.Port(test.url.Host)!="" {
+			//	if got != test.url.Host+":80" {
+			//		t.Errorf("canonicalAddr() = %v, want %v", got, test.want)
+			//		return
+			//	}
+			//}
+			if got != test.url.Host+":"+portMap[test.url.Scheme] {
+				t.Errorf("canonicalAddr() = %v, want %v", got, test.want)
+				return
+			}
+		})
+	}
+
 }
 
 func TestUseProxy(t *testing.T) {
-	// TODO
+	tests := []struct {
+		name string
+		addr string
+		want bool
+	}{
+		{addr: string("192.168.1.1:80"), want: true},
+		{addr: string("192.168.1.2:80"), want: true},
+		{addr: string("192.168.1.3:80"), want: true},
+		{addr: string("192.168.1.4:80"), want: true},
+	}
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			got := useProxy(test.addr)
+			if got == false {
+				t.Errorf("useProxy(%v) = %v, want %v", test.addr, got, test.want)
+				return
+			}
+		})
+	}
 }

test/z_cli_daemon_test.go

@@ -1,5 +1,4 @@
 package main
-
 import (
 	"encoding/json"
 	"fmt"