Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix tests
[src/xds/xds-server.git]
/
test
/
main_test.go
diff --git
a/test/main_test.go
b/test/main_test.go
index
4889991
..
ced75a6
100644
(file)
--- a/
test/main_test.go
+++ b/
test/main_test.go
@@
-47,18
+47,21
@@
var HTTPCli *common.HTTPClient
var logDir string
var sCli *IOSockClient
var logDir string
var sCli *IOSockClient
+// Debug function used to print debug logs
func Debug(t *testing.T, args ...interface{}) {
if os.Getenv("VERBOSE") != "" {
func Debug(t *testing.T, args ...interface{}) {
if os.Getenv("VERBOSE") != "" {
- t.Log(args)
+ t.Log(args
...
)
}
}
}
}
+// Debugf function used to print debug logs
func Debugf(t *testing.T, format string, args ...interface{}) {
if os.Getenv("VERBOSE") != "" {
func Debugf(t *testing.T, format string, args ...interface{}) {
if os.Getenv("VERBOSE") != "" {
- t.Logf(format, args)
+ t.Logf(format, args
...
)
}
}
}
}
+// Copy copies from src to dst until either EOF
func Copy(src, dst string) error {
in, err := os.Open(src)
if err != nil {
func Copy(src, dst string) error {
in, err := os.Open(src)
if err != nil {
@@
-144,17
+147,17
@@
func getHTTPClient(lvl int) (*common.HTTPClient, *os.File) {
LogPrefix: "XDSSERVERTEST: ",
LogLevel: lvl,
}
LogPrefix: "XDSSERVERTEST: ",
LogLevel: lvl,
}
- cli, err := common.HTTPNewClient(prefixURL, conf)
+
HTTP
cli, err := common.HTTPNewClient(prefixURL, conf)
if err != nil {
log.Fatal(err)
}
if err != nil {
log.Fatal(err)
}
- log.Printf("HTTP session ID : %v", cli.GetClientID())
+ log.Printf("HTTP session ID : %v",
HTTP
cli.GetClientID())
var ver xsapiv1.Version
var ver xsapiv1.Version
- err = cli.Get("/version", &ver)
+ err =
HTTP
cli.Get("/version", &ver)
if err != nil {
log.Fatal(err)
}
if err != nil {
log.Fatal(err)
}
- return cli, file
+ return
HTTP
cli, file
}
func NewIoSocketClient(url, clientID string) (*IOSockClient, error) {
}
func NewIoSocketClient(url, clientID string) (*IOSockClient, error) {
@@
-191,7
+194,7
@@
func NewIoSocketClient(url, clientID string) (*IOSockClient, error) {
}
func TestMain(m *testing.M) {
/* useful for debugging, preventing from launching xds-server
}
func TestMain(m *testing.M) {
/* useful for debugging, preventing from launching xds-server
- * it can be launch separ
et
ly */
+ * it can be launch separ
ate
ly */
launchProcess := true
log.Printf("TestMain: launchProcess is %v, so launching xds-server", launchProcess)
initEnv(launchProcess)
launchProcess := true
log.Printf("TestMain: launchProcess is %v, so launching xds-server", launchProcess)
initEnv(launchProcess)