Skip to content

Commit 6dcb6ae

Browse files
authored
Replace .Nil by .NoError in tests (#522)
1 parent 15516e2 commit 6dcb6ae

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

task/task_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestTask(t *testing.T) {
5959
outputFile := filepath.Join(outputDirectory, "file")
6060

6161
relativeOutputDirectory, err := filepath.Rel(baseDirectory, outputDirectory)
62-
require.Nil(t, err)
62+
require.NoError(t, err)
6363

6464
cloud := common.Cloud{
6565
Provider: provider,
@@ -108,30 +108,30 @@ func TestTask(t *testing.T) {
108108
ctx := context.TODO()
109109

110110
newTask, err := New(ctx, cloud, identifier, task)
111-
require.Nil(t, err)
111+
require.NoError(t, err)
112112

113-
require.Nil(t, newTask.Delete(ctx))
113+
require.NoError(t, newTask.Delete(ctx))
114114
if sweepOnly {
115115
return
116116
}
117117

118-
require.Nil(t, os.Mkdir(cacheDirectory, 0777))
119-
require.Nil(t, os.Mkdir(outputDirectory, 0777))
118+
require.NoError(t, os.Mkdir(cacheDirectory, 0777))
119+
require.NoError(t, os.Mkdir(outputDirectory, 0777))
120120

121121
file, err := os.Create(outputFile)
122-
require.Nil(t, err)
122+
require.NoError(t, err)
123123

124124
_, err = file.WriteString(oldData)
125-
require.Nil(t, err)
126-
require.Nil(t, file.Close())
125+
require.NoError(t, err)
126+
require.NoError(t, file.Close())
127127

128-
require.Nil(t, newTask.Create(ctx))
129-
require.Nil(t, newTask.Create(ctx))
128+
require.NoError(t, newTask.Create(ctx))
129+
require.NoError(t, newTask.Create(ctx))
130130

131131
loop:
132-
for assert.Nil(t, newTask.Read(ctx)) {
132+
for assert.NoError(t, newTask.Read(ctx)) {
133133
logs, err := newTask.Logs(ctx)
134-
require.Nil(t, err)
134+
require.NoError(t, err)
135135

136136
for _, log := range logs {
137137
if strings.Contains(log, oldData) &&
@@ -148,9 +148,9 @@ func TestTask(t *testing.T) {
148148
require.Equal(t, newTask.Stop(ctx), common.NotImplementedError)
149149
}
150150

151-
for assert.Nil(t, newTask.Read(ctx)) {
151+
for assert.NoError(t, newTask.Read(ctx)) {
152152
status, err := newTask.Status(ctx)
153-
require.Nil(t, err)
153+
require.NoError(t, err)
154154

155155
if status[common.StatusCodeActive] == 0 &&
156156
status[common.StatusCodeSucceeded] > 0 {
@@ -160,14 +160,14 @@ func TestTask(t *testing.T) {
160160
time.Sleep(10 * time.Second)
161161
}
162162

163-
require.Nil(t, newTask.Delete(ctx))
164-
require.Nil(t, newTask.Delete(ctx))
163+
require.NoError(t, newTask.Delete(ctx))
164+
require.NoError(t, newTask.Delete(ctx))
165165

166166
require.NoFileExists(t, cacheFile)
167167
require.FileExists(t, outputFile)
168168

169169
contents, err := ioutil.ReadFile(outputFile)
170-
require.Nil(t, err)
170+
require.NoError(t, err)
171171

172172
require.Contains(t, string(contents), newData)
173173
})

0 commit comments

Comments
 (0)