mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-03-22 06:45:03 +01:00
fixes
This commit is contained in:
@@ -3,7 +3,6 @@ package model
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
@@ -20,7 +19,7 @@ test:
|
||||
}
|
||||
require.NoError(t, err)
|
||||
err = resolveAliases(&node)
|
||||
assert.Error(t, err)
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
func TestVerifyNoRecursion(t *testing.T) {
|
||||
@@ -100,13 +99,13 @@ c: *a
|
||||
var node yaml.Node
|
||||
err := yaml.Unmarshal([]byte(tt.yaml), &node)
|
||||
if tt.yamlErr {
|
||||
assert.Error(t, err)
|
||||
require.Error(t, err)
|
||||
return
|
||||
}
|
||||
require.NoError(t, err)
|
||||
err = resolveAliases(&node)
|
||||
if tt.anchorErr {
|
||||
assert.Error(t, err)
|
||||
require.Error(t, err)
|
||||
} else {
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
@@ -246,19 +246,19 @@ jobs:
|
||||
|
||||
jobType, err := workflow.Jobs["remote-reusable-workflow-missing-version"].Type()
|
||||
assert.Equal(t, JobTypeInvalid, jobType)
|
||||
assert.Error(t, err)
|
||||
require.Error(t, err)
|
||||
|
||||
jobType, err = workflow.Jobs["remote-reusable-workflow-bad-extension"].Type()
|
||||
assert.Equal(t, JobTypeInvalid, jobType)
|
||||
assert.Error(t, err)
|
||||
require.Error(t, err)
|
||||
|
||||
jobType, err = workflow.Jobs["local-reusable-workflow-bad-extension"].Type()
|
||||
assert.Equal(t, JobTypeInvalid, jobType)
|
||||
assert.Error(t, err)
|
||||
require.Error(t, err)
|
||||
|
||||
jobType, err = workflow.Jobs["local-reusable-workflow-bad-path"].Type()
|
||||
assert.Equal(t, JobTypeInvalid, jobType)
|
||||
assert.Error(t, err)
|
||||
require.Error(t, err)
|
||||
}
|
||||
|
||||
func TestReadWorkflow_StepsTypes(t *testing.T) {
|
||||
@@ -283,7 +283,7 @@ jobs:
|
||||
`
|
||||
|
||||
_, err := ReadWorkflow(strings.NewReader(yaml), WorkflowConfig{})
|
||||
assert.Error(t, err, "read workflow should fail")
|
||||
require.Error(t, err, "read workflow should fail")
|
||||
}
|
||||
|
||||
// See: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idoutputs
|
||||
@@ -582,7 +582,7 @@ jobs:
|
||||
`
|
||||
|
||||
_, err := ReadWorkflow(strings.NewReader(yaml), WorkflowConfig{Strict: true})
|
||||
assert.Error(t, err, "read workflow should succeed")
|
||||
require.Error(t, err, "read workflow should succeed")
|
||||
}
|
||||
|
||||
func TestReadWorkflow_AnchorStrict(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user