jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-12 10:55:20 +02:00
Code Issues Releases Activity

Enable parallel execution with reused mocks (#2331)

Browse Source 
* Enables parallel execution and prevent reuse of file mock

* Fixes warnings

* Makes tests proper parallelized

* Update cmd/mavenExecuteIntegration_test.go

Co-authored-by: Christopher Fenner <26137398+CCFenner@users.noreply.github.com>

Co-authored-by: Christopher Fenner <26137398+CCFenner@users.noreply.github.com>
This commit is contained in:
Fabian Reh 2020-11-10 08:44:52 +01:00 committed by GitHub
parent 0234e4908c
commit bf39d2aacc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmd/detectExecuteScan_test.go
View File

@ -20,15 +20,15 @@ type detectTestUtilsBundle struct {
*mock.FilesMock
}
func (c *detectTestUtilsBundle) RunExecutable(e string, p ...string) error {
func (c *detectTestUtilsBundle) RunExecutable(string, ...string) error {
panic("not expected to be called in test")
}
func (c *detectTestUtilsBundle) SetOptions(options piperhttp.ClientOptions) {
func (c *detectTestUtilsBundle) SetOptions(piperhttp.ClientOptions) {
}
func (c *detectTestUtilsBundle) DownloadFile(url, filename string, header http.Header, cookies []*http.Cookie) error {
func (c *detectTestUtilsBundle) DownloadFile(url, filename string, _ http.Header, _ []*http.Cookie) error {
if c.expectedError != nil {
return c.expectedError
@ -41,20 +41,21 @@ func (c *detectTestUtilsBundle) DownloadFile(url, filename string, header http.H
return nil
}
func newDetectTestUtilsBundle() detectTestUtilsBundle {
func newDetectTestUtilsBundle() *detectTestUtilsBundle {
utilsBundle := detectTestUtilsBundle{
ShellMockRunner: &mock.ShellMockRunner{},
FilesMock: &mock.FilesMock{},
}
return utilsBundle
return &utilsBundle
}
func TestRunDetect(t *testing.T) {
t.Parallel()
t.Run("success case", func(t *testing.T) {
t.Parallel()
utilsMock := newDetectTestUtilsBundle()
utilsMock.AddFile("detect.sh", []byte(""))
err := runDetect(detectExecuteScanOptions{}, &utilsMock)
err := runDetect(detectExecuteScanOptions{}, utilsMock)
assert.Equal(t, utilsMock.downloadedFiles["https://detect.synopsys.com/detect.sh"], "detect.sh")
assert.True(t, utilsMock.HasRemovedFile("detect.sh"))
@ -66,16 +67,17 @@ func TestRunDetect(t *testing.T) {
})
t.Run("failure case", func(t *testing.T) {
t.Parallel()
utilsMock := newDetectTestUtilsBundle()
utilsMock.ShouldFailOnCommand = map[string]error{"./detect.sh --blackduck.url= --blackduck.api.token= --detect.project.name=\\\"\\\" --detect.project.version.name=\\\"\\\" --detect.code.location.name=\\\"\\\"": fmt.Errorf("Test Error")}
utilsMock.AddFile("detect.sh", []byte(""))
err := runDetect(detectExecuteScanOptions{}, &utilsMock)
err := runDetect(detectExecuteScanOptions{}, utilsMock)
assert.EqualError(t, err, "Test Error")
assert.True(t, utilsMock.HasRemovedFile("detect.sh"))
})
t.Run("maven parameters", func(t *testing.T) {
t.Parallel()
utilsMock := newDetectTestUtilsBundle()
utilsMock.CurrentDir = "root_folder"
utilsMock.AddFile("detect.sh", []byte(""))
@ -83,7 +85,7 @@ func TestRunDetect(t *testing.T) {
M2Path: ".pipeline/local_repo",
ProjectSettingsFile: "project-settings.xml",
GlobalSettingsFile: "global-settings.xml",
}, &utilsMock)
}, utilsMock)
assert.NoError(t, err)
assert.Equal(t, ".", utilsMock.Dir, "Wrong execution directory used")
@ -96,8 +98,7 @@ func TestRunDetect(t *testing.T) {
}
func TestAddDetectArgs(t *testing.T) {
utilsMock := newDetectTestUtilsBundle()
t.Parallel()
testData := []struct {
args []string
options detectExecuteScanOptions
@ -183,8 +184,10 @@ func TestAddDetectArgs(t *testing.T) {
}
for k, v := range testData {
v := v
t.Run(fmt.Sprintf("run %v", k), func(t *testing.T) {
got, err := addDetectArgs(v.args, v.options, &utilsMock)
t.Parallel()
got, err := addDetectArgs(v.args, v.options, newDetectTestUtilsBundle())
assert.NoError(t, err)
assert.Equal(t, v.expected, got)
})

8
cmd/mavenExecuteIntegration_test.go
View File

@ -3,6 +3,7 @@ package cmd
import (
"github.com/SAP/jenkins-library/pkg/mock"
"github.com/stretchr/testify/assert"
"path/filepath"
"testing"
)
@ -12,6 +13,7 @@ type mavenExecuteIntegrationTestUtilsBundle struct {
}
func TestIntegrationTestModuleDoesNotExist(t *testing.T) {
t.Parallel()
utils := newMavenIntegrationTestsUtilsBundle()
config := mavenExecuteIntegrationOptions{}
@ -21,6 +23,7 @@ func TestIntegrationTestModuleDoesNotExist(t *testing.T) {
}
func TestHappyPathIntegrationTests(t *testing.T) {
t.Parallel()
utils := newMavenIntegrationTestsUtilsBundle()
utils.FilesMock.AddFile("integration-tests/pom.xml", []byte(`<project> </project>`))
@ -36,7 +39,7 @@ func TestHappyPathIntegrationTests(t *testing.T) {
expectedParameters1 := []string{
"--file",
"integration-tests/pom.xml",
filepath.Join(".", "integration-tests", "pom.xml"),
"-Dsurefire.rerunFailingTestsCount=2",
"-Dsurefire.forkCount=1C",
"-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn",
@ -49,6 +52,7 @@ func TestHappyPathIntegrationTests(t *testing.T) {
}
func TestInvalidForkCountParam(t *testing.T) {
t.Parallel()
// init
utils := newMavenIntegrationTestsUtilsBundle()
utils.FilesMock.AddFile("integration-tests/pom.xml", []byte(`<project> </project>`))
@ -113,7 +117,9 @@ func TestValidateForkCount(t *testing.T) {
}
for _, testCase := range testCases {
testCase := testCase
t.Run(testCase.name, func(t *testing.T) {
t.Parallel()
err := validateForkCount(testCase.testValue)
if testCase.expectedError == "" {
assert.NoError(t, err)