Skip to content

Fix unit test, make test fail immediately on error, rather than conti… #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 13, 2018
Merged

Fix unit test, make test fail immediately on error, rather than conti… #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0161beb
Fix unit test, make test fail immediately on error, rather than conti…
helinwang Jan 12, 2018
958c4a3
Merge branch 'develop' into fix_unit_test
typhoonzero Jan 13, 2018
f7bc130
Merge branch 'develop' into fix_unit_test
helinwang Jan 13, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion go/glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 8 additions & 16 deletions go/utils/restclient/token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ import (
"os"
"path/filepath"
"testing"
"time"

"github.com/PaddlePaddle/cloud/go/utils/config"
"github.com/PaddlePaddle/cloud/go/utils/pathutil"
"github.com/stretchr/testify/require"
)

func fakeServer() (*http.Server, int) {
Expand All @@ -32,6 +34,7 @@ func fakeServer() (*http.Server, int) {
return
}
}()
time.Sleep(50 * time.Millisecond)
return srv, listener.Addr().(*net.TCPAddr).Port
}

Expand All @@ -49,26 +52,15 @@ func TestTokenParse(t *testing.T) {
}}

token, err := Token(tmpconf)
if err != nil {
t.Errorf("get token error %v", err)
}
if token != "testtokenvalue" {
t.Error("token not equal to the server: (" + token + ")")
}
require.Nil(t, err, "get token")
require.Equal(t, "testtokenvalue", token, "token not equal to the server")

// FIXME: separate these tests
// test token request
uri := fmt.Sprintf("http://127.0.0.1:%d/fake-api/", port)
req, err := MakeRequest(uri, "GET", nil, "", nil, nil)
if err != nil {
t.Errorf("make request error %v", err)
}
require.Nil(t, err, "make request")
resp, err := GetResponse(req)
if err != nil {
t.Errorf("get request error %v", err)
}
if string(resp) != "fakeresult" {
t.Error("error result fetched")
}

require.Nil(t, err, "get request")
require.Equal(t, "fakeresult", string(resp))
}