From 25d5b01b3c8d68a207ed10c70fff569675f8c349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Mon, 13 Jun 2022 15:28:53 +0200
Subject: [PATCH] Cleanup: test errors with `assert.NoError()` instead of
 `assert.Nil()`

No functional changes, just nicer way to test.
---
 internal/manager/job_compilers/js_globals_test.go | 12 ++++++------
 internal/worker/config_test.go                    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal/manager/job_compilers/js_globals_test.go b/internal/manager/job_compilers/js_globals_test.go
index ea92dc6e..b0abb8c3 100644
--- a/internal/manager/job_compilers/js_globals_test.go
+++ b/internal/manager/job_compilers/js_globals_test.go
@@ -10,7 +10,7 @@ import (
 
 func TestFrameChunkerHappyBlenderStyle(t *testing.T) {
 	chunks, err := jsFrameChunker("1..10,20..25,40,3..8", 4)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, []string{"1-4", "5-8", "9,10,20,21", "22-25", "40"}, chunks)
 }
 
@@ -21,30 +21,30 @@ func TestFrameChunkerHappySmallInput(t *testing.T) {
 
 	// Just one frame.
 	chunks, err := jsFrameChunker("47", 4)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, []string{"47"}, chunks)
 
 	// Just one range of exactly one chunk.
 	chunks, err = jsFrameChunker("1-3", 3)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, []string{"1-3"}, chunks)
 }
 
 func TestFrameChunkerHappyRegularStyle(t *testing.T) {
 	chunks, err := jsFrameChunker("1-10,20-25,40", 4)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, []string{"1-4", "5-8", "9,10,20,21", "22-25", "40"}, chunks)
 }
 
 func TestFrameChunkerHappyExtraWhitespace(t *testing.T) {
 	chunks, err := jsFrameChunker(" 1  .. 10,\t20..25\n,40   ", 4)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, []string{"1-4", "5-8", "9,10,20,21", "22-25", "40"}, chunks)
 }
 
 func TestFrameRangeExplode(t *testing.T) {
 	frames, err := frameRangeExplode("1..10,20..25,40")
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	assert.Equal(t, []int{
 		1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
 		20, 21, 22, 23, 24, 25, 40,
diff --git a/internal/worker/config_test.go b/internal/worker/config_test.go
index 673947a3..ae0b84c5 100644
--- a/internal/worker/config_test.go
+++ b/internal/worker/config_test.go
@@ -11,7 +11,7 @@ import (
 func TestParseURL(t *testing.T) {
 	test := func(expected, input string) {
 		actualURL, err := ParseURL(input)
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 		assert.Equal(t, expected, actualURL.String())
 	}