[merge] pull request #1566

api/controllers/apps_test.go

@@ -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"])
 	}
@@ -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"])
 	}
@@ -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"])
 	}
@@ -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"])
 		}
@@ -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"])
 	}
 }

api/models/release_test.go

@@ -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)
@@ -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)

client/apps_test.go

@@ -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")
@@ -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")

client/service_test.go

@@ -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")

client/system_test.go

@@ -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")

cmd/convox/install_test.go

@@ -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{}
 

cmd/convox/rack_test.go

@@ -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{

manifest/balancer_test.go

@@ -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]
 
@@ -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]
 
@@ -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]
 

manifest/manifest_test.go

@@ -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)
 
@@ -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)
 
@@ -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)
 
@@ -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)
 		}
@@ -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)
 		}
@@ -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")
@@ -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")
@@ -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")
@@ -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")
 			}
 		}
@@ -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")
 			}
 		}
@@ -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) {
@@ -345,10 +345,10 @@ func TestTcpUdp(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)
 		}
 	}
@@ -357,7 +357,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()
@@ -371,10 +371,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)
 			}
 		}
@@ -389,7 +389,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{
@@ -407,7 +407,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"]

manifest/ports_test.go

@@ -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) {
@@ -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"]
 

manifest/service_test.go

@@ -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)
 		}
 	}

provider/aws/apps_test.go

@@ -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) {
@@ -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",