knative
/
func
mirror of https://github.com/knative/func.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: use proper temp dir for funs in e2e tests (#1345) 

Signed-off-by: Matej Vasek <mvasek@redhat.com>

Signed-off-by: Matej Vasek <mvasek@redhat.com>
This commit is contained in:
Matej Vasek 2022-10-17 12:51:57 +02:00 committed by GitHub
parent c685a82e7f
commit ee49339bc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/_e2e/e2e_functions_test.go
View File

@ -14,7 +14,7 @@ import (
// for a function that responds to HTTP
func TestHttpFunction(t *testing.T) {
project := NewFunctionTestProject(GetRuntime(), "http")
project := NewFunctionTestProject(t, GetRuntime(), "http")
knFunc := NewKnFuncShellCli(t)
Create(t, knFunc, project)
@ -33,7 +33,7 @@ func TestHttpFunction(t *testing.T) {
// for a function that responds to CloudEvents
func TestCloudEventsFunction(t *testing.T) {
project := NewFunctionTestProject(GetRuntime(), "cloudevents")
project := NewFunctionTestProject(t, GetRuntime(), "cloudevents")
knFunc := NewKnFuncShellCli(t)
Create(t, knFunc, project)

5
test/_e2e/func_test_proj.go
View File

@ -4,6 +4,7 @@ import (
"fmt"
"os"
"path/filepath"
"testing"
)
// FunctionTestProject
@ -35,13 +36,13 @@ type FunctionTestProject struct {
}
// NewFunctionTestProject initiates a project with derived function name an project path
func NewFunctionTestProject(runtime string, template string) FunctionTestProject {
func NewFunctionTestProject(t *testing.T, runtime string, template string) FunctionTestProject {
project := FunctionTestProject{
Runtime: runtime,
Template: template,
}
project.FunctionName = "func-" + runtime + "-" + template
project.ProjectPath = filepath.Join(os.TempDir(), project.FunctionName)
project.ProjectPath = filepath.Join(t.TempDir(), project.FunctionName)
return project
}

6
test/_e2e/update_test.go
View File

@ -26,7 +26,7 @@ func Update(t *testing.T, knFunc *TestShellCmdRunner, project *FunctionTestProje
// Template folder exists for given runtime / template.
// Let's update the project and redeploy
err := projectUpdaterFor(project).UpdateFolderContent(templatePath, project)
err := projectUpdaterFor(project).UpdateFolderContent(t, templatePath, project)
if err != nil {
t.Fatal("an error has occurred while updating project folder with new sources.", err.Error())
}
@ -64,9 +64,9 @@ func projectUpdaterFor(project *FunctionTestProject) projectUpdater {
return updater
}
func (p projectUpdater) UpdateFolderContent(templatePath string, project *FunctionTestProject) error {
func (p projectUpdater) UpdateFolderContent(t *testing.T, templatePath string, project *FunctionTestProject) error {
// Create temp project folder (reuse func.yaml)
projectTmp := NewFunctionTestProject(project.Runtime, project.Template)
projectTmp := NewFunctionTestProject(t, project.Runtime, project.Template)
projectTmp.ProjectPath = projectTmp.ProjectPath + "-tmp"
err := projectTmp.CreateProjectFolder()
if err != nil {