Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add tests for preupgradchecks and spec/archive CLI (#2874)

Browse Source 
* Add tests for preupgradchecks
* Add spec tests
* Add package archive tests
* Wait for cleanup
* Fix test and coverage

---------

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2023-11-17 14:08:38 +05:30
committed by GitHub
parent e7d6381876
commit d23ed572f9
18 changed files with 186 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/e2e/cli/cli_test.go
+79 -6
View File
@@ -2,6 +2,8 @@ package cli_test
import (
"context"
"os"
"strings"
"testing"
"time"
@@ -17,16 +19,17 @@ import (
)
func TestFissionCLI(t *testing.T) {
mgr := manager.New()
defer mgr.Wait()
f := framework.NewFramework()
defer f.Logger().Sync()
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
err := f.Start(ctx)
require.NoError(t, err)
defer func() {
cancel()
mgr.Wait()
err = f.Stop()
require.NoError(t, err)
}()
err = services.StartServices(ctx, f, mgr)
require.NoError(t, err)
@@ -220,7 +223,7 @@ func TestFissionCLI(t *testing.T) {
_, err = cli.ExecCommand(f, ctx, "function", "create", "--name", "test-func", "--code", "./hello.js", "--env", "test-func-env")
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "httptrigger", "create", "--name", "test-httptrigger", "--function", "test-func", "--url", "/hello")
_, err = cli.ExecCommand(f, ctx, "httptrigger", "create", "--name", "test-httptrigger", "--function", "test-func", "--url", "/hello", "--createingress")
require.NoError(t, err)
ht, err := fissionClient.CoreV1().HTTPTriggers(metav1.NamespaceDefault).Get(ctx, "test-httptrigger", metav1.GetOptions{})
@@ -371,5 +374,75 @@ func TestFissionCLI(t *testing.T) {
t.Run("support-dump", func(t *testing.T) {
_, err := cli.ExecCommand(f, ctx, "support", "dump")
require.NoError(t, err)
err = os.RemoveAll("fission-dump")
require.NoError(t, err)
})
t.Run("archive", func(t *testing.T) {
out, err := cli.ExecCommand(f, ctx, "archive", "upload", "--name", "hello.js")
require.NoError(t, err)
require.Contains(t, out, "File successfully uploaded with ID")
id := out[len("File successfully uploaded with ID: "):]
// split string by / and get the last element
id = strings.Split(id, "/")[len(strings.Split(id, "/"))-1]
id = strings.Trim(id, "\n")
_, err = cli.ExecCommand(f, ctx, "archive", "list")
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "archive", "get-url", "--id", id)
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "archive", "download", "--id", id)
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "archive", "delete", "--id", id)
require.NoError(t, err)
})
t.Run("spec", func(t *testing.T) {
// check if specs directory exists and delete it
if info, err := os.Stat("specs"); err == nil && info.IsDir() {
err = os.RemoveAll("specs")
require.NoError(t, err)
}
_, err := cli.ExecCommand(f, ctx, "spec", "init")
require.NoError(t, err)
// create resources
_, err = cli.ExecCommand(f, ctx, "env", "create", "--name", "test-func-env", "--image", "fission/python-env", "--spec")
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "function", "create", "--name", "test-func", "--code", "./hello.js", "--env", "test-func-env", "--spec")
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "httptrigger", "create", "--name", "test-httptrigger", "--function", "test-func", "--url", "/hello", "--spec", "--createingress")
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "timetrigger", "create", "--name", "test-tt", "--function", "test-func", "--cron", "@every 1m", "--spec")
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "mqtrigger", "create", "--name", "test-mqtrigger", "--function", "test-func", "--mqtype", "kafka", "--topic", "test-topic", "--resptopic", "test-resp-topic", "--spec")
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "spec", "validate")
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "spec", "apply")
require.NoError(t, err)
fn, err := fissionClient.CoreV1().Functions(metav1.NamespaceDefault).Get(ctx, "test-func", metav1.GetOptions{})
require.NoError(t, err)
require.NotNil(t, fn)
require.Equal(t, "test-func", fn.Name)
_, err = cli.ExecCommand(f, ctx, "spec", "list")
require.NoError(t, err)
_, err = cli.ExecCommand(f, ctx, "spec", "destroy")
require.NoError(t, err)
_, err = fissionClient.CoreV1().Functions(metav1.NamespaceDefault).Get(ctx, "test-func", metav1.GetOptions{})
require.Error(t, err)
// cleanup specs directory
err = os.RemoveAll("specs")
require.NoError(t, err)
})
}
test/e2e/framework/cli/cli.go
+2
View File
@@ -4,6 +4,7 @@ import (
"bytes"
"context"
"go.uber.org/zap"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/fission/fission/cmd/fission-cli/app"
@@ -12,6 +13,7 @@ import (
)
func ExecCommand(f *framework.Framework, ctx context.Context, args ...string) (string, error) {
f.Logger().Info("Executing command", zap.Strings("args", args))
cmd := app.App(cmd.ClientOptions{
RestConfig: f.RestConfig(),
Namespace: metav1.NamespaceDefault,
test/e2e/framework/framework.go
+8 -7
View File
@@ -20,11 +20,6 @@ import (
"github.com/fission/fission/pkg/utils/loggerfactory"
)
const (
EXECUTOR_URL = "http://executor.fission"
STORAGESVC_URL = "http://storagesvc.fission"
)
type ServiceInfo struct {
Port int
}
@@ -61,10 +56,14 @@ func NewFramework() *Framework {
if err != nil {
panic(err)
}
_, filename, _, _ := runtime.Caller(0) //nolint
root := filepath.Dir(filename)
crdPath := filepath.Join(root, "..", "..", "..", "crds", "v1")
return &Framework{
logger: loggerfactory.GetLogger(),
env: &envtest.Environment{
CRDDirectoryPaths: []string{filepath.Join("../../..", "crds", "v1")},
CRDDirectoryPaths: []string{crdPath},
ErrorIfCRDPathMissing: true,
CRDInstallOptions: envtest.CRDInstallOptions{
MaxTime: 60 * time.Second,
@@ -111,9 +110,11 @@ func (f *Framework) ClientGen() *crd.ClientGenerator {
}
func (f *Framework) Stop() error {
f.logger.Info("Stopping test env")
_ = f.logger.Sync()
err := f.env.Stop()
if err != nil {
return fmt.Errorf("error stopping test env: %v", err)
return fmt.Errorf("error stopping test env: %w", err)
}
return nil
}
test/e2e/framework/services/services.go
+9 -2
View File
@@ -87,6 +87,11 @@ func StartServices(ctx context.Context, f *framework.Framework, mgr manager.Inte
return fmt.Errorf("error starting storage service: %v", err)
}
f.AddServiceInfo("storagesvc", framework.ServiceInfo{Port: storageSvcPort})
storagesvcURL, err := f.GetServiceURL("storagesvc")
if err != nil {
return fmt.Errorf("error getting storage service URL: %v", err)
}
os.Setenv("FISSION_STORAGESVC_URL", storagesvcURL)
err = f.ToggleMetricAddr()
if err != nil {
return fmt.Errorf("error toggling metric address: %v", err)
@@ -122,8 +127,10 @@ func StartServices(ctx context.Context, f *framework.Framework, mgr manager.Inte
return fmt.Errorf("error starting router: %v", err)
}
f.AddServiceInfo("router", framework.ServiceInfo{Port: routerPort})
routerURL := fmt.Sprintf("http://localhost:%d", routerPort)
routerURL, err := f.GetServiceURL("router")
if err != nil {
return fmt.Errorf("error getting router URL: %v", err)
}
os.Setenv("FISSION_ROUTER_URL", routerURL)
err = timer.Start(ctx, f.ClientGen(), f.Logger(), mgr, routerURL)
test/tests/test_archive_cli.sh
+1 -1
View File
@@ -54,7 +54,7 @@ ls | grep "$fileID"
# Test for get-url
getURLResp=$(fission ar get-url --id "$filename")
echo "$getURLResp" | grep "http://storagesvc.fission/v1/archive?id=%2Ffission%2Ffission-functions%2F$fileID"
echo "$getURLResp" | grep "/v1/archive?id=%2Ffission%2Ffission-functions%2F$fileID"
# Test for delete
fission ar delete --id "$filename"