Skip to content

Commit

Permalink
Use .NoError() instead of .Nil() for error checking in tests, as .NoE…
Browse files Browse the repository at this point in the history 
…rror prints the error instead of just saying it should’ve been nil
  • Loading branch information
@spencerhakim @MiguelMoll
spencerhakim authored and MiguelMoll committed Jan 18, 2017
1 parent 5c15d65 commit 7d20278
Show file tree
Hide file tree
Showing 26 changed files with 104 additions and 104 deletions.
10 changes: 5 additions & 5 deletions api/controllers/apps_test.go
View file
Expand Up @@ -27,7 +27,7 @@ func TestAppList(t *testing.T) {
var resp []map[string]string
err := json.Unmarshal([]byte(body), &resp)

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.Equal(t, "bar", resp[0]["name"])
assert.Equal(t, "running", resp[0]["status"])
}
Expand All @@ -44,7 +44,7 @@ func TestAppShow(t *testing.T) {
var resp map[string]string
err := json.Unmarshal([]byte(body), &resp)

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.Equal(t, "bar", resp["name"])
assert.Equal(t, "running", resp["status"])
}
Expand All @@ -62,7 +62,7 @@ func TestAppShowUnbound(t *testing.T) {
var resp map[string]string
err := json.Unmarshal([]byte(body), &resp)

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.Equal(t, "bar", resp["name"])
assert.Equal(t, "running", resp["status"])
}
Expand Down Expand Up @@ -99,7 +99,7 @@ func TestAppCreate(t *testing.T) {
var resp map[string]string
err := json.Unmarshal([]byte(body), &resp)

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.Equal(t, "application", resp["name"])
assert.Equal(t, "running", resp["status"])
}
Expand Down Expand Up @@ -160,7 +160,7 @@ func TestAppDelete(t *testing.T) {
var resp map[string]bool
err := json.Unmarshal([]byte(body), &resp)

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.Equal(t, true, resp["success"])
}
}
Expand Down
12 changes: 6 additions & 6 deletions api/models/fixtures_test.go
View file
Expand Up @@ -23,7 +23,7 @@ func TestFixtures(t *testing.T) {
fixtures, err := availableFixtures()

require.NotNil(t, fixtures)
require.Nil(t, err)
require.NoError(t, err)

for _, fixture := range fixtures {
assertFixture(t, fixture)
Expand Down Expand Up @@ -64,19 +64,19 @@ func assertFixture(t *testing.T, name string) {
}

data, err := ioutil.ReadFile(fmt.Sprintf("fixtures/%s.yml", name))
require.Nil(t, err)
require.NoError(t, err)

manifest, err := manifest.Load(data)
require.Nil(t, err)
require.NoError(t, err)

formation, err := app.Formation(*manifest)
require.Nil(t, err)
require.NoError(t, err)

pretty, err := models.PrettyJSON(formation)
require.Nil(t, err)
require.NoError(t, err)

data, err = ioutil.ReadFile(fmt.Sprintf("fixtures/%s.json", name))
require.Nil(t, err)
require.NoError(t, err)

diff1 := strings.Split(strings.TrimSpace(string(data)), "\n")
diff2 := strings.Split(strings.TrimSpace(pretty), "\n")
Expand Down
8 changes: 4 additions & 4 deletions api/models/release_test.go
View file
Expand Up @@ -51,13 +51,13 @@ func TestLinks(t *testing.T) {
os.Setenv("CLUSTER", "convox-test")

resp, err := ioutil.ReadFile("fixtures/get-app-template-response.xml")
require.Nil(t, err)
require.NoError(t, err)

fixData, err := ioutil.ReadFile("fixtures/web_redis.json")
require.Nil(t, err)
require.NoError(t, err)

yamlData, err := ioutil.ReadFile("fixtures/web_redis.yml")
require.Nil(t, err)
require.NoError(t, err)

getAppTemplateCycle := test.GetAppTemplateCycle("web")
getAppTemplateCycle.Response.Body = string(resp)
Expand All @@ -77,7 +77,7 @@ func TestLinks(t *testing.T) {

ManifestRandomPorts = false
formation, err := release.Formation()
require.Nil(t, err)
require.NoError(t, err)
ManifestRandomPorts = true

Diff(t, "web_redis", string(fixData), formation)
Expand Down
4 changes: 2 additions & 2 deletions client/apps_test.go
View file
Expand Up @@ -19,7 +19,7 @@ func TestGetApps(t *testing.T) {
apps, err := testClient(t, ts.URL).GetApps()

assert.NotNil(t, apps, "apps should not be nil")
assert.Nil(t, err, "err should be nil")
assert.NoError(t, err)

assert.Equal(t, 1, len(apps), 2, "there should be one app")
assert.Equal(t, "sinatra", apps[0].Name, "app name should be sinatra")
Expand Down Expand Up @@ -56,7 +56,7 @@ func TestGetApp(t *testing.T) {
app, err := testClient(t, ts.URL).GetApp("sinatra")

assert.NotNil(t, app, "apps should not be nil")
assert.Nil(t, err, "err should be nil")
assert.NoError(t, err)

assert.Equal(t, "sinatra", app.Name, "app name should be sinatra")
assert.Equal(t, "running", app.Status, "app status should be running")
Expand Down
2 changes: 1 addition & 1 deletion client/service_test.go
View file
Expand Up @@ -23,7 +23,7 @@ func TestGetService(t *testing.T) {
service, err := testClient(t, ts.URL).GetResource("convox-events")

assert.NotNil(t, service, "service should not be nil")
assert.Nil(t, err, "err should be nil")
assert.NoError(t, err)

assert.Equal(t, "convox-events", service.Name, ".Name should be convox-events")
assert.Equal(t, "running", service.Status, ".Status should be running")
Expand Down
2 changes: 1 addition & 1 deletion client/system_test.go
View file
Expand Up @@ -24,7 +24,7 @@ func TestGetSystem(t *testing.T) {
system, err := testClient(t, ts.URL).GetSystem()

assert.NotNil(t, system, "system should not be nil")
assert.Nil(t, err, "err should be nil")
assert.NoError(t, err)

assert.Equal(t, 1, system.Count, ".Count should be 1")
assert.Equal(t, "system", system.Name, ".Name should be system")
Expand Down
4 changes: 2 additions & 2 deletions cmd/convox/install_test.go
View file
Expand Up @@ -103,11 +103,11 @@ func TestConvoxInstallFriendlyName(t *testing.T) {
}

data, err := ioutil.ReadFile("../../provider/aws/dist/rack.json")
assert.Nil(t, err)
assert.NoError(t, err)
assert.NotEmpty(t, data)

err = json.Unmarshal(data, &formation)
assert.Nil(t, err)
assert.NoError(t, err)

types := map[string]bool{}

Expand Down
4 changes: 2 additions & 2 deletions cmd/convox/rack_test.go
View file
Expand Up @@ -2,10 +2,10 @@ package main

// func TestRackUpdateStable(t *testing.T) {
// versions, err := version.All()
// require.Nil(t, err)
// require.NoError(t, err)

// stable, err := versions.Resolve("stable")
// require.Nil(t, err)
// require.NoError(t, err)

// ts := testServer(t,
// test.Http{Method: "PUT", Body: fmt.Sprintf("version=%s", stable.Version), Path: "/system", Code: 200, Response: client.System{
Expand Down
6 changes: 3 additions & 3 deletions manifest/balancer_test.go
View file
Expand Up @@ -9,7 +9,7 @@ import (
func TestBalancer(t *testing.T) {
m, err := manifestFixture("balancer")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
if assert.Equal(t, len(m.Balancers()), 1) {
balancer := m.Balancers()[0]

Expand All @@ -24,7 +24,7 @@ func TestBalancer(t *testing.T) {
func TestBalancerLabels(t *testing.T) {
m, err := manifestFixture("balancer-labels")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
if assert.Equal(t, len(m.Balancers()), 1) {
balancer := m.Balancers()[0]

Expand All @@ -39,7 +39,7 @@ func TestBalancerLabels(t *testing.T) {
func TestBalancerSecure(t *testing.T) {
m, err := manifestFixture("balancer-secure")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
if assert.Equal(t, len(m.Balancers()), 1) {
balancer := m.Balancers()[0]

Expand Down
40 changes: 20 additions & 20 deletions manifest/manifest_test.go
View file
Expand Up @@ -18,7 +18,7 @@ import (
func TestLoadVersion1(t *testing.T) {
m, err := manifestFixture("v1")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.Equal(t, m.Version, "1")
assert.Equal(t, len(m.Services), 1)

Expand All @@ -31,7 +31,7 @@ func TestLoadVersion1(t *testing.T) {
func TestLoadVersion2(t *testing.T) {
m, err := manifestFixture("v2-number")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.Equal(t, m.Version, "2")
assert.Equal(t, len(m.Services), 1)

Expand All @@ -42,7 +42,7 @@ func TestLoadVersion2(t *testing.T) {

m, err = manifestFixture("v2-string")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.Equal(t, m.Version, "2")
assert.Equal(t, len(m.Services), 1)

Expand All @@ -55,7 +55,7 @@ func TestLoadVersion2(t *testing.T) {
func TestLoadCommandString(t *testing.T) {
m, err := manifestFixture("command-string")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
if web := m.Services["web"]; assert.NotNil(t, web) {
assert.Equal(t, web.Command.String, manifest.Command{String: "ls -la"}.String)
}
Expand All @@ -65,7 +65,7 @@ func TestLoadCommandString(t *testing.T) {
func TestLoadCommandArray(t *testing.T) {
m, err := manifestFixture("command-array")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
if web := m.Services["web"]; assert.NotNil(t, web) {
assert.Equal(t, web.Command.Array, manifest.Command{Array: []string{"ls", "-la"}}.Array)
}
Expand All @@ -75,7 +75,7 @@ func TestLoadCommandArray(t *testing.T) {
func TestLoadFullVersion1(t *testing.T) {
m, err := manifestFixture("full-v1")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
if web := m.Services["web"]; assert.NotNil(t, web) {
assert.Equal(t, web.Build.Context, ".")
assert.Equal(t, web.Build.Dockerfile, "Dockerfile.dev")
Expand Down Expand Up @@ -136,7 +136,7 @@ func TestLoadFullVersion1(t *testing.T) {
func TestLoadFullVersion2(t *testing.T) {
m, err := manifestFixture("full-v2")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
if web := m.Services["web"]; assert.NotNil(t, web) {
assert.Equal(t, web.Build.Context, ".")
assert.Equal(t, web.Build.Dockerfile, "Dockerfile.dev")
Expand Down Expand Up @@ -227,7 +227,7 @@ func TestLoadEnvVar(t *testing.T) {

m, err := manifestFixture("interpolate-env-var")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.Equal(t, m.Services["web"].Image, rando1)
assert.Equal(t, m.Services["web"].Entrypoint, fmt.Sprintf("%s/%s/%s", rando2, rando2, rando3))
assert.Equal(t, m.Services["web"].Build.Dockerfile, "$REMAIN")
Expand All @@ -239,10 +239,10 @@ func TestLoadEnvVar(t *testing.T) {
func TestLoadIdleTimeoutUnset(t *testing.T) {
m, err := manifestFixture("idle-timeout-unset")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
if assert.Equal(t, 1, len(m.Balancers())) {
b := m.Balancers()[0]
if val, err := b.IdleTimeout(); assert.Nil(t, err) {
if val, err := b.IdleTimeout(); assert.NoError(t, err) {
assert.Equal(t, val, "3600")
}
}
Expand All @@ -252,10 +252,10 @@ func TestLoadIdleTimeoutUnset(t *testing.T) {
func TestLoadIdleTimeoutSet(t *testing.T) {
m, err := manifestFixture("idle-timeout-set")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
if assert.Equal(t, 1, len(m.Balancers())) {
b := m.Balancers()[0]
if val, err := b.IdleTimeout(); assert.Nil(t, err) {
if val, err := b.IdleTimeout(); assert.NoError(t, err) {
assert.Equal(t, val, "99")
}
}
Expand Down Expand Up @@ -310,7 +310,7 @@ func TestLoadUnknownVersion(t *testing.T) {
func TestExternalPorts(t *testing.T) {
m, err := manifestFixture("full-v1")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
ports := m.ExternalPorts()

if assert.Equal(t, len(ports), 2) {
Expand All @@ -323,10 +323,10 @@ func TestExternalPorts(t *testing.T) {
func TestPortConflictsWithoutConflict(t *testing.T) {
m, err := manifestFixture("port-conflicts")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
pc, err := m.PortConflicts()

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.Equal(t, len(pc), 0)
}
}
Expand All @@ -335,7 +335,7 @@ func TestPortConflictsWithoutConflict(t *testing.T) {
func TestPortConflictsWithConflict(t *testing.T) {
m, err := manifestFixture("port-conflicts")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
l, err := net.Listen("tcp", "127.0.0.1:30544")

defer l.Close()
Expand All @@ -349,10 +349,10 @@ func TestPortConflictsWithConflict(t *testing.T) {
}
}()

if assert.Nil(t, err) {
if assert.NoError(t, err) {
pc, err := m.PortConflicts()

if assert.Nil(t, err) && assert.Equal(t, len(pc), 1) {
if assert.NoError(t, err) && assert.Equal(t, len(pc), 1) {
assert.Equal(t, pc[0], 30544)
}
}
Expand All @@ -367,7 +367,7 @@ func TestPortConflictsWithConflict(t *testing.T) {

func TestManifestNetworks(t *testing.T) {
m, err := manifestFixture("networks")
if assert.Nil(t, err) {
if assert.NoError(t, err) {
for _, s := range m.Services {
assert.Equal(t, s.Networks, manifest.Networks{
"foo": manifest.InternalNetwork{
Expand All @@ -385,7 +385,7 @@ func TestManifestNetworks(t *testing.T) {
func TestShift(t *testing.T) {
m, err := manifestFixture("shift")

if assert.Nil(t, err) {
if assert.NoError(t, err) {
m.Shift(5000)

web := m.Services["web"]
Expand Down
4 changes: 2 additions & 2 deletions manifest/ports_test.go
View file
Expand Up @@ -30,7 +30,7 @@ func TestPortsShift(t *testing.T) {
m, err := manifestFixture("shift")
m.Shift(5000)

if assert.Nil(t, err) {
if assert.NoError(t, err) {
web := m.Services["web"]

if assert.NotNil(t, web) {
Expand All @@ -50,7 +50,7 @@ func TestPortsShiftWithSSL(t *testing.T) {
// Shift the whole manifest by 2; this is evaluated in addition to any per-service convox.start.shift labels.
m.Shift(2)

if assert.Nil(t, err) {
if assert.NoError(t, err) {
// Web has a convox.start.shift label, for a total shift of 4.
web := m.Services["web"]

Expand Down
2 changes: 1 addition & 1 deletion manifest/service_test.go
View file
Expand Up @@ -87,7 +87,7 @@ func TestSyncPaths(t *testing.T) {
for _, s := range m.Services {
sp, err := s.SyncPaths()

if assert.Nil(t, err) {
if assert.NoError(t, err) {
assert.EqualValues(t, expectedMap, sp)
}
}
Expand Down
4 changes: 2 additions & 2 deletions provider/aws/apps_test.go
View file
Expand Up @@ -22,7 +22,7 @@ func TestAppCancel(t *testing.T) {

err := provider.AppCancel("httpd")

assert.Nil(t, err)
assert.NoError(t, err)
}

func TestAppGet(t *testing.T) {
Expand All @@ -33,7 +33,7 @@ func TestAppGet(t *testing.T) {

a, err := provider.AppGet("httpd")

assert.Nil(t, err)
assert.NoError(t, err)
assert.EqualValues(t, &structs.App{
Name: "httpd",
Release: "RVFETUHHKKD",
Expand Down

0 comments on commit 7d20278

Please sign in to comment.