diff options
author | Nick Thomas <nick@gitlab.com> | 2018-03-09 15:08:09 +0300 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-03-09 15:08:09 +0300 |
commit | e29d6cd873b5b52f992cd19fa4ac69f8ecaf2923 (patch) | |
tree | 8f6d9b49e18aaa66371302ae2485d0ee1935698e | |
parent | 796d920a9b7ee631b174acda2bb78348a23808dc (diff) | |
parent | 4f29d1ee7ae1b67ee2b5907ca8ad2911c438d394 (diff) |
Merge branch 'require-not-assert' into 'master'
Use require.NoError to halt tests after errors
See merge request gitlab-org/gitlab-pages!67
-rw-r--r-- | acceptance_test.go | 36 | ||||
-rw-r--r-- | domain_config_test.go | 7 | ||||
-rw-r--r-- | domain_test.go | 2 | ||||
-rw-r--r-- | helpers_test.go | 12 | ||||
-rw-r--r-- | multi_string_flag_test.go | 8 |
5 files changed, 33 insertions, 32 deletions
diff --git a/acceptance_test.go b/acceptance_test.go index 8396cf65..8d0bf295 100644 --- a/acceptance_test.go +++ b/acceptance_test.go @@ -55,7 +55,7 @@ func TestUnknownHostReturnsNotFound(t *testing.T) { for _, spec := range listeners { rsp, err := GetPageFromListener(t, spec, "invalid.invalid", "") - assert.NoError(t, err) + require.NoError(t, err) rsp.Body.Close() assert.Equal(t, http.StatusNotFound, rsp.StatusCode) } @@ -69,7 +69,7 @@ func TestKnownHostReturns200(t *testing.T) { for _, spec := range listeners { rsp, err := GetPageFromListener(t, spec, "group.gitlab-example.com", "project/") - assert.NoError(t, err) + require.NoError(t, err) rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } @@ -144,7 +144,7 @@ func TestKnownHostWithPortReturns200(t *testing.T) { for _, spec := range listeners { rsp, err := GetPageFromListener(t, spec, "group.gitlab-example.com:"+spec.Port, "project/") - assert.NoError(t, err) + require.NoError(t, err) rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } @@ -157,12 +157,12 @@ func TestHttpToHttpsRedirectDisabled(t *testing.T) { defer teardown() rsp, err := GetRedirectPage(t, httpListener, "group.gitlab-example.com", "project/") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) rsp, err = GetPageFromListener(t, httpsListener, "group.gitlab-example.com", "project/") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } @@ -173,14 +173,14 @@ func TestHttpToHttpsRedirectEnabled(t *testing.T) { defer teardown() rsp, err := GetRedirectPage(t, httpListener, "group.gitlab-example.com", "project/") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusTemporaryRedirect, rsp.StatusCode) assert.Equal(t, 1, len(rsp.Header["Location"])) assert.Equal(t, "https://group.gitlab-example.com/project/", rsp.Header.Get("Location")) rsp, err = GetPageFromListener(t, httpsListener, "group.gitlab-example.com", "project/") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } @@ -191,7 +191,7 @@ func TestHttpsOnlyGroupEnabled(t *testing.T) { defer teardown() rsp, err := GetRedirectPage(t, httpListener, "group.https-only.gitlab-example.com", "project1/") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusMovedPermanently, rsp.StatusCode) } @@ -202,7 +202,7 @@ func TestHttpsOnlyGroupDisabled(t *testing.T) { defer teardown() rsp, err := GetPageFromListener(t, httpListener, "group.https-only.gitlab-example.com", "project2/") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } @@ -213,7 +213,7 @@ func TestHttpsOnlyProjectEnabled(t *testing.T) { defer teardown() rsp, err := GetRedirectPage(t, httpListener, "test.my-domain.com", "/index.html") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusMovedPermanently, rsp.StatusCode) } @@ -224,7 +224,7 @@ func TestHttpsOnlyProjectDisabled(t *testing.T) { defer teardown() rsp, err := GetPageFromListener(t, httpListener, "test2.my-domain.com", "/") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } @@ -235,7 +235,7 @@ func TestHttpsOnlyDomainDisabled(t *testing.T) { defer teardown() rsp, err := GetPageFromListener(t, httpListener, "no.cert.com", "/") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } @@ -263,7 +263,7 @@ func TestStatusPage(t *testing.T) { defer teardown() rsp, err := GetPageFromListener(t, httpListener, "group.gitlab-example.com", "@statuscheck") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } @@ -274,7 +274,7 @@ func TestStatusNotYetReady(t *testing.T) { defer teardown() rsp, err := GetPageFromListener(t, httpListener, "group.gitlab-example.com", "@statuscheck") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusServiceUnavailable, rsp.StatusCode) } @@ -285,7 +285,7 @@ func TestPageNotAvailableIfNotLoaded(t *testing.T) { defer teardown() rsp, err := GetPageFromListener(t, httpListener, "group.gitlab-example.com", "index.html") - assert.NoError(t, err) + require.NoError(t, err) defer rsp.Body.Close() assert.Equal(t, http.StatusServiceUnavailable, rsp.StatusCode) } @@ -428,7 +428,7 @@ func TestEnvironmentVariablesConfig(t *testing.T) { rsp, err := GetPageFromListener(t, httpListener, "group.gitlab-example.com:", "project/") - assert.NoError(t, err) + require.NoError(t, err) rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } @@ -444,7 +444,7 @@ func TestMixedConfigSources(t *testing.T) { for _, listener := range []ListenSpec{httpListener, httpsListener} { rsp, err := GetPageFromListener(t, listener, "group.gitlab-example.com", "project/") - assert.NoError(t, err) + require.NoError(t, err) rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } @@ -464,7 +464,7 @@ func TestMultiFlagEnvironmentVariables(t *testing.T) { for _, listener := range listenSpec { rsp, err := GetPageFromListener(t, listener, "group.gitlab-example.com", "project/") - assert.NoError(t, err) + require.NoError(t, err) rsp.Body.Close() assert.Equal(t, http.StatusOK, rsp.StatusCode) } diff --git a/domain_config_test.go b/domain_config_test.go index 307060ef..22194ad4 100644 --- a/domain_config_test.go +++ b/domain_config_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) const configFile = "test-group/test-project/config.json" @@ -51,14 +52,14 @@ func TestDomainConfigRead(t *testing.T) { assert.Error(t, err) err = ioutil.WriteFile(configFile, []byte(invalidConfig), 0600) - assert.NoError(t, err) + require.NoError(t, err) d = domainsConfig{} err = d.Read("test-group", "test-project") assert.Error(t, err) err = ioutil.WriteFile(configFile, []byte(validConfig), 0600) - assert.NoError(t, err) + require.NoError(t, err) d = domainsConfig{} err = d.Read("test-group", "test-project") - assert.NoError(t, err) + require.NoError(t, err) } diff --git a/domain_test.go b/domain_test.go index 454148ae..b51e6d7a 100644 --- a/domain_test.go +++ b/domain_test.go @@ -238,7 +238,7 @@ func TestDomainCertificate(t *testing.T) { tls, err := testDomain.ensureCertificate() assert.NotNil(t, tls) - assert.NoError(t, err) + require.NoError(t, err) } func TestCacheControlHeaders(t *testing.T) { diff --git a/helpers_test.go b/helpers_test.go index 4d732d81..913cf9c4 100644 --- a/helpers_test.go +++ b/helpers_test.go @@ -14,7 +14,7 @@ import ( "time" log "github.com/sirupsen/logrus" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) type tWriter struct { @@ -85,17 +85,17 @@ MwE1w2r4Deww func CreateHTTPSFixtureFiles(t *testing.T) (key string, cert string) { keyfile, err := ioutil.TempFile("", "https-fixture") - assert.NoError(t, err) + require.NoError(t, err) key = keyfile.Name() keyfile.Close() certfile, err := ioutil.TempFile("", "https-fixture") - assert.NoError(t, err) + require.NoError(t, err) cert = certfile.Name() certfile.Close() - assert.NoError(t, ioutil.WriteFile(key, []byte(KeyFixture), 0644)) - assert.NoError(t, ioutil.WriteFile(cert, []byte(CertificateFixture), 0644)) + require.NoError(t, ioutil.WriteFile(key, []byte(KeyFixture), 0644)) + require.NoError(t, ioutil.WriteFile(cert, []byte(CertificateFixture), 0644)) return keyfile.Name(), certfile.Name() } @@ -141,7 +141,7 @@ func (l ListenSpec) JoinHostPort() string { // If run as root via sudo, the gitlab-pages process will drop privileges func RunPagesProcess(t *testing.T, pagesPath string, listeners []ListenSpec, promPort string, extraArgs ...string) (teardown func()) { _, err := os.Stat(pagesPath) - assert.NoError(t, err) + require.NoError(t, err) args, tempfiles := getPagesArgs(t, listeners, promPort, extraArgs) cmd := exec.Command(pagesPath, args...) diff --git a/multi_string_flag_test.go b/multi_string_flag_test.go index ca561bc4..20cac831 100644 --- a/multi_string_flag_test.go +++ b/multi_string_flag_test.go @@ -4,7 +4,7 @@ import ( "flag" "testing" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestMultiStringFlagAppendsOnSet(t *testing.T) { @@ -13,8 +13,8 @@ func TestMultiStringFlagAppendsOnSet(t *testing.T) { iface = &concrete - assert.NoError(t, iface.Set("foo")) - assert.NoError(t, iface.Set("bar")) + require.NoError(t, iface.Set("foo")) + require.NoError(t, iface.Set("bar")) - assert.Equal(t, MultiStringFlag{"foo", "bar"}, concrete) + require.Equal(t, MultiStringFlag{"foo", "bar"}, concrete) } |