MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-09 05:34:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move to URL based syntax formatting. (#3092)

Browse Source 
For command line arguments we are currently following

- <node-1>:/path ... <node-n>:/path

This patch changes this to

- http://<node-1>/path ... http://<node-n>/path
This commit is contained in:
Harshavardhana
2016-10-27 03:30:52 -07:00
committed by GitHub
parent 30dc11a931
commit 9e2d0ac50b
36 changed files with 560 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
cmd/utils_test.go
View File

@@ -18,7 +18,9 @@ package cmd
import (
"fmt"
"net"
"net/http"
"net/url"
"reflect"
"runtime"
"testing"
@@ -224,7 +226,8 @@ func TestLocalAddress(t *testing.T) {
return
}
// need to set this to avoid stale values from other tests.
globalMinioPort = 9000
globalMinioPort = "9000"
globalMinioHost = ""
testCases := []struct {
srvCmdConfig serverCmdConfig
localAddr string
@@ -233,39 +236,64 @@ func TestLocalAddress(t *testing.T) {
{
srvCmdConfig: serverCmdConfig{
isDistXL: true,
endPoints: []storageEndPoint{
{"localhost", 9000, "/mnt/disk1"},
{"1.1.1.2", 9000, "/mnt/disk2"},
{"1.1.2.1", 9000, "/mnt/disk3"},
{"1.1.2.2", 9000, "/mnt/disk4"},
},
endpoints: []*url.URL{{
Scheme: "http",
Host: "localhost:9000",
Path: "/mnt/disk1",
}, {
Scheme: "http",
Host: "1.1.1.2:9000",
Path: "/mnt/disk2",
}, {
Scheme: "http",
Host: "1.1.2.1:9000",
Path: "/mnt/disk3",
}, {
Scheme: "http",
Host: "1.1.2.2:9000",
Path: "/mnt/disk4",
}},
},
localAddr: fmt.Sprintf("localhost:%d", globalMinioPort),
localAddr: net.JoinHostPort("localhost", globalMinioPort),
},
// Test 2 - local address is everything.
{
srvCmdConfig: serverCmdConfig{
serverAddr: fmt.Sprintf(":%d", globalMinioPort),
serverAddr: net.JoinHostPort("", globalMinioPort),
isDistXL: false,
endPoints: []storageEndPoint{
{path: "/mnt/disk1"},
{path: "/mnt/disk2"},
{path: "/mnt/disk3"},
{path: "/mnt/disk4"},
},
endpoints: []*url.URL{{
Path: "/mnt/disk1",
}, {
Path: "/mnt/disk2",
}, {
Path: "/mnt/disk3",
}, {
Path: "/mnt/disk4",
}},
},
localAddr: fmt.Sprintf(":%d", globalMinioPort),
localAddr: net.JoinHostPort("", globalMinioPort),
},
// Test 3 - local address is not found.
{
srvCmdConfig: serverCmdConfig{
isDistXL: true,
endPoints: []storageEndPoint{
{"1.1.1.1", 9000, "/mnt/disk1"},
{"1.1.1.2", 9000, "/mnt/disk2"},
{"1.1.2.1", 9000, "/mnt/disk3"},
{"1.1.2.2", 9000, "/mnt/disk4"},
},
endpoints: []*url.URL{{
Scheme: "http",
Host: "1.1.1.1:9000",
Path: "/mnt/disk2",
}, {
Scheme: "http",
Host: "1.1.1.2:9000",
Path: "/mnt/disk2",
}, {
Scheme: "http",
Host: "1.1.2.1:9000",
Path: "/mnt/disk3",
}, {
Scheme: "http",
Host: "1.1.2.2:9000",
Path: "/mnt/disk4",
}},
},
localAddr: "",
},
@@ -276,12 +304,15 @@ func TestLocalAddress(t *testing.T) {
srvCmdConfig: serverCmdConfig{
serverAddr: "play.minio.io:9000",
isDistXL: false,
endPoints: []storageEndPoint{
{path: "/mnt/disk1"},
{path: "/mnt/disk2"},
{path: "/mnt/disk3"},
{path: "/mnt/disk4"},
},
endpoints: []*url.URL{{
Path: "/mnt/disk1",
}, {
Path: "/mnt/disk2",
}, {
Path: "/mnt/disk3",
}, {
Path: "/mnt/disk4",
}},
},
localAddr: "play.minio.io:9000",
},