airship/airshipctl
Code Issues Proposed changes

Merge "Fix a failure when running unit tests locally"

Browse Source
This commit is contained in:
Zuul 2020-03-17 14:17:14 +00:00 committed by Gerrit Code Review
commit 3618fecdb0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/k8s/client/client_test.go
View File

@ -1,4 +1,4 @@
package client package client_test
import ( import (
"path/filepath" "path/filepath"
@ -8,6 +8,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"opendev.org/airship/airshipctl/pkg/environment" "opendev.org/airship/airshipctl/pkg/environment"
"opendev.org/airship/airshipctl/pkg/k8s/client"
"opendev.org/airship/airshipctl/testutil"
) )
const ( const (
@ -15,9 +17,11 @@ const (
airshipConfigDir = "testdata" airshipConfigDir = "testdata"
) )
func TestNewclient(t *testing.T) { func TestNewClient(t *testing.T) {
settings := &environment.AirshipCTLSettings{} settings := &environment.AirshipCTLSettings{}
settings.InitConfig() conf, cleanup := testutil.InitConfig(t)
defer cleanup(t)
settings.SetConfig(conf)
akp, err := filepath.Abs(kubeconfigPath) akp, err := filepath.Abs(kubeconfigPath)
require.NoError(t, err) require.NoError(t, err)
@ -28,7 +32,7 @@ func TestNewclient(t *testing.T) {
settings.SetAirshipConfigPath(adir) settings.SetAirshipConfigPath(adir)
settings.SetKubeConfigPath(akp) settings.SetKubeConfigPath(akp)
client, err := NewClient(settings) client, err := client.NewClient(settings)
assert.NoError(t, err) assert.NoError(t, err)
assert.NotNil(t, client) assert.NotNil(t, client)
assert.NotNil(t, client.ClientSet()) assert.NotNil(t, client.ClientSet())