Skip to content

Commit cf55923

Browse files
duanhongyiduanhongyi
committed
chore(workflow-cli): use testify replace assert
1 parent 98c075b commit cf55923

62 files changed

Lines changed: 314 additions & 305 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/apps_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"testing"
1010

11-
"github.com/arschles/assert"
11+
"github.com/stretchr/testify/assert"
1212

1313
"github.com/drycc/workflow-cli/pkg/git"
1414
"github.com/drycc/workflow-cli/pkg/testutil"
@@ -62,7 +62,7 @@ func TestAppsList(t *testing.T) {
6262
})
6363

6464
err = cmdr.AppsList(-1)
65-
assert.NoErr(t, err)
65+
assert.NoError(t, err)
6666
assert.Equal(t, b.String(), `=== Apps
6767
lorem-ipsum
6868
consectetur
@@ -101,7 +101,7 @@ func TestAppsListLimit(t *testing.T) {
101101
})
102102

103103
err = cmdr.AppsList(1)
104-
assert.NoErr(t, err)
104+
assert.NoError(t, err)
105105
assert.Equal(t, b.String(), `=== Apps (1 of 2)
106106
lorem-ipsum
107107
`, "output")
@@ -194,7 +194,7 @@ func TestAppsInfo(t *testing.T) {
194194
}
195195

196196
err = cmdr.AppInfo("lorem-ipsum")
197-
assert.NoErr(t, err)
197+
assert.NoError(t, err)
198198
assert.Equal(t, b.String(), `=== lorem-ipsum Application
199199
updated: 2016-08-22T17:40:16Z
200200
uuid: c4aed81c-d1ca-4ff1-ab89-d2151264e1a3
@@ -243,7 +243,7 @@ func TestAppDestroy(t *testing.T) {
243243
assert.Equal(t, err.Error(), `app lorem-ipsum does not match confirm bad-confirm-string, aborting`, "output")
244244

245245
err = cmdr.AppDestroy("lorem-ipsum", "lorem-ipsum")
246-
assert.NoErr(t, err)
246+
assert.NoError(t, err)
247247
assert.Equal(t, testutil.StripProgress(b.String()), `Destroying lorem-ipsum...
248248
done in 0s
249249
`, "output")
@@ -274,7 +274,7 @@ func TestAppTransfer(t *testing.T) {
274274
})
275275

276276
err = cmdr.AppTransfer("lorem-ipsum", "test-user")
277-
assert.NoErr(t, err)
277+
assert.NoError(t, err)
278278
assert.Equal(t, testutil.StripProgress(b.String()), `Transferring lorem-ipsum to test-user... done
279279
`, "output")
280280
}
@@ -320,14 +320,14 @@ func TestRemoteExists(t *testing.T) {
320320

321321
// create a remote first before running apps:create
322322
dir, err := ioutil.TempDir("", "apps")
323-
assert.NoErr(t, err)
323+
assert.NoError(t, err)
324324

325325
defer os.RemoveAll(dir)
326326

327-
assert.NoErr(t, os.Chdir(dir))
327+
assert.NoError(t, os.Chdir(dir))
328328

329-
assert.NoErr(t, git.Init(git.DefaultCmd))
330-
assert.NoErr(t, git.CreateRemote(git.DefaultCmd, "localhost", "drycc", "appname"))
329+
assert.NoError(t, git.Init(git.DefaultCmd))
330+
assert.NoError(t, git.CreateRemote(git.DefaultCmd, "localhost", "drycc", "appname"))
331331

332332
var b bytes.Buffer
333333
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}

‎cmd/auth_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"net/http"
77
"testing"
88

9-
"github.com/arschles/assert"
109
"github.com/drycc/workflow-cli/pkg/testutil"
10+
"github.com/stretchr/testify/assert"
1111
)
1212

1313
func TestLogin(t *testing.T) {
@@ -42,7 +42,7 @@ func TestLogin(t *testing.T) {
4242
err = cmdr.Login(server.Server.URL, false)
4343
fmt.Println(err)
4444
fmt.Println(t)
45-
assert.NoErr(t, err)
45+
assert.NoError(t, err)
4646
}
4747

4848
func TestLogout(t *testing.T) {
@@ -55,7 +55,7 @@ func TestLogout(t *testing.T) {
5555
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
5656

5757
err = cmdr.Logout()
58-
assert.NoErr(t, err)
58+
assert.NoError(t, err)
5959
assert.Equal(t, b.String(), "Logged out\n", "output")
6060
}
6161

@@ -88,7 +88,7 @@ func TestWhoami(t *testing.T) {
8888
})
8989

9090
err = cmdr.Whoami(false)
91-
assert.NoErr(t, err)
91+
assert.NoError(t, err)
9292
expected := fmt.Sprintf("You are test at %s\n", server.Server.URL)
9393
assert.Equal(t, b.String(), expected, "output")
9494
}
@@ -122,7 +122,7 @@ func TestWhoamiAll(t *testing.T) {
122122
})
123123

124124
err = cmdr.Whoami(true)
125-
assert.NoErr(t, err)
125+
assert.NoError(t, err)
126126
expected := `ID: 0
127127
Username: test
128128
Email: test@example.com

‎cmd/autoscale_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"net/http"
77
"testing"
88

9-
"github.com/arschles/assert"
109
"github.com/drycc/controller-sdk-go/api"
1110
"github.com/drycc/workflow-cli/pkg/testutil"
11+
"github.com/stretchr/testify/assert"
1212
)
1313

1414
func TestAutoscaleList(t *testing.T) {
@@ -34,7 +34,7 @@ func TestAutoscaleList(t *testing.T) {
3434
})
3535

3636
err = cmdr.AutoscaleList("rivendell")
37-
assert.NoErr(t, err)
37+
assert.NoError(t, err)
3838
assert.Equal(t, b.String(), "=== rivendell Autoscale\n\n--- cmd:\nMin Replicas: 3\nMax Replicas: 8\nCPU: 40%\n", "output")
3939

4040
server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, r *http.Request) {
@@ -50,7 +50,7 @@ func TestAutoscaleList(t *testing.T) {
5050
b.Reset()
5151

5252
err = cmdr.AutoscaleList("mordor")
53-
assert.NoErr(t, err)
53+
assert.NoError(t, err)
5454
assert.Equal(t, b.String(), "=== mordor Autoscale\n\nNo autoscale rules found.\n", "output")
5555
}
5656

@@ -78,7 +78,7 @@ func TestAutoscaleSet(t *testing.T) {
7878
})
7979

8080
err = cmdr.AutoscaleSet("lothlorien", "cmd", 3, 8, 40)
81-
assert.NoErr(t, err)
81+
assert.NoError(t, err)
8282
assert.Equal(t, testutil.StripProgress(b.String()), "Applying autoscale settings for process type cmd on lothlorien... done\n", "output")
8383
}
8484

@@ -99,6 +99,6 @@ func TestAutoscaleUnset(t *testing.T) {
9999
})
100100

101101
err = cmdr.AutoscaleUnset("bree", "cmd")
102-
assert.NoErr(t, err)
102+
assert.NoError(t, err)
103103
assert.Equal(t, testutil.StripProgress(b.String()), "Removing autoscale for process type cmd on bree... done\n", "output")
104104
}

‎cmd/builds_test.go‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"os"
99
"testing"
1010

11-
"github.com/arschles/assert"
1211
"github.com/drycc/controller-sdk-go/api"
1312
"github.com/drycc/workflow-cli/pkg/testutil"
13+
"github.com/stretchr/testify/assert"
1414
)
1515

1616
func TestParseProcfile(t *testing.T) {
@@ -19,14 +19,13 @@ func TestParseProcfile(t *testing.T) {
1919
procMap, err := parseProcfile([]byte(`web: ./test
2020
foo: test --test
2121
`))
22-
assert.NoErr(t, err)
22+
assert.NoError(t, err)
2323
assert.Equal(t, procMap, map[string]string{"web": "./test", "foo": "test --test"}, "map")
2424

2525
_, err = parseProcfile([]byte(`web: ./test
2626
foo
2727
`))
28-
29-
assert.ExistsErr(t, err, "yaml")
28+
assert.NotEqual(t, err, nil, "yaml")
3029
}
3130

3231
func TestBuildsList(t *testing.T) {
@@ -73,7 +72,7 @@ func TestBuildsList(t *testing.T) {
7372
})
7473

7574
err = cmdr.BuildsList("foo", -1)
76-
assert.NoErr(t, err)
75+
assert.NoError(t, err)
7776
assert.Equal(t, b.String(), `=== foo Builds
7877
de1bf5b5-4a72-4f94-a10c-d2a3741cdf75 2014-01-01T00:00:00UTC
7978
c4aed81c-d1ca-4ff1-ab89-d2151264e1a3 2014-01-05T00:00:00UTC
@@ -113,7 +112,7 @@ func TestBuildsListLimit(t *testing.T) {
113112
})
114113

115114
err = cmdr.BuildsList("foo", 1)
116-
assert.NoErr(t, err)
115+
assert.NoError(t, err)
117116
assert.Equal(t, b.String(), `=== foo Builds (1 of 2)
118117
de1bf5b5-4a72-4f94-a10c-d2a3741cdf75 2014-01-01T00:00:00UTC
119118
`, "output")
@@ -131,9 +130,9 @@ func TestBuildsCreate(t *testing.T) {
131130

132131
// Create a new temporary directory and change to it.
133132
name, err := ioutil.TempDir("", "client")
134-
assert.NoErr(t, err)
133+
assert.NoError(t, err)
135134
err = os.Chdir(name)
136-
assert.NoErr(t, err)
135+
assert.NoError(t, err)
137136

138137
server.Mux.HandleFunc("/v2/apps/enterprise/builds/", func(w http.ResponseWriter, r *http.Request) {
139138
testutil.SetHeaders(w)
@@ -146,7 +145,7 @@ func TestBuildsCreate(t *testing.T) {
146145
})
147146

148147
err = cmdr.BuildsCreate("enterprise", "ncc/1701:A", "container", "")
149-
assert.NoErr(t, err)
148+
assert.NoError(t, err)
150149
assert.Equal(t, testutil.StripProgress(b.String()), "Creating build... done\n", "output")
151150

152151
server.Mux.HandleFunc("/v2/apps/bradbury/builds/", func(w http.ResponseWriter, r *http.Request) {
@@ -168,7 +167,7 @@ func TestBuildsCreate(t *testing.T) {
168167
err = cmdr.BuildsCreate("bradbury", "nx/72307:latest", "container", `web: ./drive
169168
warp: ./warp 8
170169
`)
171-
assert.NoErr(t, err)
170+
assert.NoError(t, err)
172171
assert.Equal(t, testutil.StripProgress(b.String()), "Creating build... done\n", "output")
173172

174173
server.Mux.HandleFunc("/v2/apps/franklin/builds/", func(w http.ResponseWriter, r *http.Request) {
@@ -190,10 +189,10 @@ warp: ./warp 8
190189
err = ioutil.WriteFile("Procfile", []byte(`web: ./drive
191190
warp: ./warp 8
192191
`), os.ModePerm)
193-
assert.NoErr(t, err)
192+
assert.NoError(t, err)
194193

195194
err = cmdr.BuildsCreate("franklin", "nx/326:latest", "container", "")
196-
assert.NoErr(t, err)
195+
assert.NoError(t, err)
197196
assert.Equal(t, testutil.StripProgress(b.String()), "Creating build... done\n", "output")
198197

199198
}

‎cmd/certs_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"testing"
99
"time"
1010

11-
"github.com/arschles/assert"
1211
"github.com/drycc/controller-sdk-go/api"
1312
"github.com/drycc/workflow-cli/pkg/testutil"
13+
"github.com/stretchr/testify/assert"
1414
)
1515

1616
func TestCertsList(t *testing.T) {
@@ -69,7 +69,7 @@ func TestCertsList(t *testing.T) {
6969
})
7070

7171
err = cmdr.CertsList(-1, time.Date(2016, time.June, 9, 0, 0, 0, 0, time.UTC))
72-
assert.NoErr(t, err)
72+
assert.NoError(t, err)
7373

7474
assert.Equal(t, b.String(), ` Name | Common Name | SubjectAltName | Expires | Fingerprint | Domains | Updated | Created
7575
-------------------+------------------+----------------------+--------------------------+-----------------+----------------------+------------+-------------
@@ -99,7 +99,7 @@ func TestCertsList(t *testing.T) {
9999
})
100100

101101
err = cmdr.CertsList(-1, time.Now())
102-
assert.NoErr(t, err)
102+
assert.NoError(t, err)
103103

104104
assert.Equal(t, b.String(), "No certs\n", "output")
105105
}
@@ -142,7 +142,7 @@ func TestCertsListLimit(t *testing.T) {
142142
})
143143

144144
err = cmdr.CertsList(1, time.Date(2016, time.June, 9, 0, 0, 0, 0, time.UTC))
145-
assert.NoErr(t, err)
145+
assert.NoError(t, err)
146146

147147
assert.Equal(t, b.String(), ` Name | Common Name | SubjectAltName | Expires | Fingerprint | Domains | Updated | Created
148148
-------------------+------------------+----------------------+-----------------------+-----------------+----------------------+------------+-------------
@@ -186,7 +186,7 @@ func TestCertsInfo(t *testing.T) {
186186
})
187187

188188
err = cmdr.CertInfo("test-example-com")
189-
assert.NoErr(t, err)
189+
assert.NoError(t, err)
190190
assert.Equal(t, b.String(), `=== test-example-com Certificate
191191
Common Name(s): test.drycc.com
192192
Expires At: 9 Jun 2016
@@ -211,7 +211,7 @@ Updated: 9 Jun 2016
211211
b.Reset()
212212

213213
err = cmdr.CertInfo("test-drycc-com")
214-
assert.NoErr(t, err)
214+
assert.NoError(t, err)
215215
assert.Equal(t, b.String(), `=== test-drycc-com Certificate
216216
Common Name(s):
217217
Expires At: unknown
@@ -244,7 +244,7 @@ func TestCertsRemove(t *testing.T) {
244244
})
245245

246246
err = cmdr.CertRemove("test-example-com")
247-
assert.NoErr(t, err)
247+
assert.NoError(t, err)
248248

249249
assert.Equal(t, testutil.StripProgress(b.String()), "Removing test-example-com... done\n", "output")
250250
}
@@ -266,7 +266,7 @@ func TestCertsAttach(t *testing.T) {
266266
})
267267

268268
err = cmdr.CertAttach("test-example-com", "drycc.com")
269-
assert.NoErr(t, err)
269+
assert.NoError(t, err)
270270

271271
assert.Equal(t, testutil.StripProgress(b.String()), "Attaching certificate test-example-com to domain drycc.com... done\n", "output")
272272
}
@@ -287,7 +287,7 @@ func TestCertsDetach(t *testing.T) {
287287
})
288288

289289
err = cmdr.CertDetach("test-example-com", "drycc.com")
290-
assert.NoErr(t, err)
290+
assert.NoError(t, err)
291291

292292
assert.Equal(t, testutil.StripProgress(b.String()), "Detaching certificate test-example-com from domain drycc.com... done\n", "output")
293293
}
@@ -310,19 +310,19 @@ func TestCertsAdd(t *testing.T) {
310310
})
311311

312312
keyFile, err := ioutil.TempFile("", "drycc-cli-unit-test-key")
313-
assert.NoErr(t, err)
313+
assert.NoError(t, err)
314314
_, err = keyFile.Write([]byte("key"))
315-
assert.NoErr(t, err)
315+
assert.NoError(t, err)
316316
keyFile.Close()
317317

318318
certFile, err := ioutil.TempFile("", "drycc-cli-unit-test-cert")
319-
assert.NoErr(t, err)
319+
assert.NoError(t, err)
320320
_, err = certFile.Write([]byte("cert"))
321-
assert.NoErr(t, err)
321+
assert.NoError(t, err)
322322
certFile.Close()
323323

324324
err = cmdr.CertAdd(certFile.Name(), keyFile.Name(), "testcert")
325-
assert.NoErr(t, err)
325+
assert.NoError(t, err)
326326

327327
assert.Equal(t, testutil.StripProgress(b.String()), "Adding SSL endpoint... done\n", "output")
328328
}

0 commit comments

Comments
 (0)