From: Clément Bénier Date: Tue, 31 Jul 2018 14:03:08 +0000 (+0200) Subject: [test exec]: in progress X-Git-Tag: 5.99.5~2^2~17 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-server.git;a=commitdiff_plain;h=0385142d33663cb70204123ed3680d58efd2ad90 [test exec]: in progress Change-Id: Ie8eb5b66ecffa7cdb87a79a1543d7b303332f190 Signed-off-by: Clément Bénier --- diff --git a/glide.yaml b/glide.yaml index 69ee318..be01c0f 100644 --- a/glide.yaml +++ b/glide.yaml @@ -39,3 +39,4 @@ import: - assert - package: github.com/sebd71/go-socket.io-client version: 46defcb47f +- package: github.com/libgit2/git2go diff --git a/test/sdks_test.go b/test/sdks_test.go index 6319542..51f1d95 100644 --- a/test/sdks_test.go +++ b/test/sdks_test.go @@ -26,7 +26,6 @@ import ( "testing" "time" - "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" socketio_client "github.com/sebd71/go-socket.io-client" "github.com/stretchr/testify/assert" @@ -91,6 +90,8 @@ func NewIoSocketClient(url, clientID string) (*IOSockClient, error) { return sCli, err } + //sCli.Conn.On(xsapiv1.) + return sCli, nil } @@ -129,24 +130,33 @@ func TestSdks(t *testing.T) { } } -func TestInstallFakeSdk(t *testing.T) { - sdk := xaapiv1.SDKInstallArgs{ - ID: "", - Filename: sdkFileName, - Force: false, - } +func installFakeSdk(t *testing.T, sdkInstall xsapiv1.SDKInstallArgs) xsapiv1.SDK { var sdkRes xsapiv1.SDK - assert.Nil(t, HTTPCli.Post("/sdks", sdk, &sdkRes)) + assert.Nil(t, HTTPCli.Post("/sdks", sdkInstall, &sdkRes)) assert.Equal(t, sdkRes.Status, "Installing") /*waiting for SDKStateChange event from channel*/ sdkFromEvent := <-ch t.Log(sdkFromEvent) assert.Equal(t, sdkRes.ID, sdkFromEvent.ID) assert.Equal(t, "Installed", sdkFromEvent.Status) + return sdkFromEvent +} + +func TestInstallFakeSdk(t *testing.T) { + sdk := xsapiv1.SDKInstallArgs{ + ID: "", + Filename: sdkFileName, + Force: false, + } + installFakeSdk(t, sdk) + var sdkRes xsapiv1.SDK + assert.NotNil(t, HTTPCli.Post("/sdks", sdk, &sdkRes)) + sdk.Force = true + //installFakeSdk(t, sdk) } func TestSdksError(t *testing.T) { - sdk := xaapiv1.SDKInstallArgs{ + sdk := xsapiv1.SDKInstallArgs{ ID: "", Filename: "", Force: false,