From 9eac2bf192d7c044560ff7d7c20232cbf60d2855 Mon Sep 17 00:00:00 2001 From: davidmarne Date: Sat, 18 Mar 2017 10:26:24 -0600 Subject: [PATCH] use compose client and get multi --- bindata.go | 4 ++-- setuprunner/setuprunner.go | 20 ++++++++++++++++---- testfiles/testbot.go.tmpl | 8 ++++---- testutils.go | 21 +++++++++++++-------- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/bindata.go b/bindata.go index 75d2ccd..ba4c2c0 100644 --- a/bindata.go +++ b/bindata.go @@ -133,7 +133,7 @@ func testfilesFlagPng() (*asset, error) { return a, nil } -var _testfilesTestbotGoTmpl = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x94\x90\x41\x6b\x3a\x31\x10\xc5\xcf\xe6\x53\x0c\x7b\x90\x8d\x4a\xfe\xff\xde\x4a\xd5\x43\x51\x68\xf7\x60\x2b\x45\x0a\x3d\x95\xb8\x8e\xcb\xd4\x98\x2c\x31\x16\x96\xe2\x77\xef\x64\x63\x8b\xeb\xad\x82\xfb\xb2\xbf\xc9\xcc\xdb\x79\xb5\x2e\x77\xba\x42\x58\xbb\x20\x04\xed\x6b\xe7\x03\xe4\xa2\x97\x19\x57\x65\x2c\x8c\xfd\xd1\x5a\xf4\xff\x1a\x42\xb3\x41\xdf\x85\xba\xa6\x2e\xa0\xcd\x81\x41\xe5\xd6\x1f\x70\x41\x2b\xbd\x47\x46\x58\x06\xae\x4a\x21\xb6\x47\x5b\xc2\xcb\xd1\xe6\xdc\x3f\x33\x84\x36\xc0\x80\x8f\xea\x7e\x59\xa4\xd7\x11\x34\x30\x38\x3b\xaa\xb7\xa4\x12\xbe\x44\x6f\xeb\x7c\x94\x1e\x7f\x9e\x5a\x7a\xb2\xc1\xd8\x3c\x7b\x2c\x32\xc9\x8c\xfd\x46\x80\x70\x37\x85\xdf\xb1\x6a\x81\xb9\xbc\xba\xce\xd7\xae\x11\x46\x40\xdb\x18\x82\x5a\xb8\x4f\x9c\xa3\xd1\x0d\x4c\xe0\xa6\xf5\x6a\x4d\x29\xce\xfd\x3f\x66\x9d\xc0\x2d\xcb\x70\x98\x6a\xb1\xad\xd4\x36\x76\xb1\xb9\xf7\x5d\xfb\x59\xaa\xe4\x31\x10\x35\x27\xcf\x09\x90\xb3\x39\xc9\x11\x70\x52\x6a\x85\x87\x10\xeb\xab\xa6\xc6\xf7\x62\x2e\xc7\xed\x84\xe9\x14\x2c\x19\xe8\xf7\x7f\x06\x9f\x9d\xba\x4b\x2f\x9e\x5f\x8b\xa7\x87\x76\x71\xfe\x5d\x6c\xfc\x07\xbf\xd4\xbb\xf6\xa8\x77\xed\xf1\x24\xce\x8f\xf8\x6f\x52\xf0\x31\xbf\x93\x38\x89\xef\x00\x00\x00\xff\xff\xea\x1b\x5c\x13\x29\x02\x00\x00") +var _testfilesTestbotGoTmpl = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x94\x50\x41\x6b\xf2\x40\x10\x3d\xbb\xbf\x62\xc8\x41\xb2\x2a\xfb\x7d\xbd\x95\xaa\x87\xa2\xd0\xe6\x60\x2b\x45\x0a\x3d\x95\x35\x8e\x61\xea\xba\x1b\xd6\xb5\x10\x8a\xff\xbd\xb3\x59\x5b\x34\xb7\x06\x92\xb7\x79\x33\xf3\xde\xce\xab\x75\xb9\xd3\x15\xc2\xda\x05\x21\x68\x5f\x3b\x1f\x20\x17\xbd\xcc\xb8\x2a\x63\x08\xa8\xf7\xfe\x68\x2d\xfa\x7f\x0d\xa1\xd9\xa0\xef\xb0\xba\xa6\x0e\x43\x9b\x03\x33\x95\x5b\x7f\xc0\x25\x5d\xe9\x3d\x32\x87\x65\xe0\xb2\x14\x62\x7b\xb4\x25\xbc\x1c\x6d\xce\x0a\x33\x43\x68\x03\x0c\xf8\xa8\xee\x97\x45\xfa\x1d\x41\x03\x83\xb3\xa9\x7a\x4b\x28\xe1\x4b\xf4\xb6\xce\x47\xe8\xf1\x15\xd5\xd2\x93\x0d\xc6\xe6\xd9\x63\x91\x49\xe6\x78\x8d\x11\x20\xdc\x4d\xe1\x57\x56\x2d\x30\x97\x9d\x76\x6e\xeb\x52\x18\x09\xda\xc6\x20\xd4\xc2\x7d\xe2\x1c\x8d\x6e\x60\x02\x37\xad\x57\x6b\x4a\x51\xf7\xff\x98\x71\x02\xb7\x0c\xc3\x61\xaa\xc5\xb1\x52\xdb\x38\xc5\xe6\xde\x5f\xdb\xcf\x52\x25\x8f\x89\xa8\x39\x79\x4e\x80\x9c\xcd\x49\x8e\x80\xa3\x52\x2b\x3c\x84\x58\x5f\x35\x35\xbe\x17\x73\x39\x6e\x15\xa6\x53\xb0\x64\xa0\xdf\xff\x11\x3e\x3b\x5d\x2f\xbd\x78\x7e\x2d\x9e\x1e\xda\xc5\xf9\xb9\xd8\xf8\x0f\x7e\x69\x76\xed\x51\xef\xda\xe3\x49\x9c\x3f\xf1\x6d\x52\xf0\x31\xbf\x93\x38\x89\xef\x00\x00\x00\xff\xff\x5c\x72\x80\x96\x2d\x02\x00\x00") func testfilesTestbotGoTmplBytes() ([]byte, error) { return bindataRead( @@ -148,7 +148,7 @@ func testfilesTestbotGoTmpl() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "testfiles/testbot.go.tmpl", size: 553, mode: os.FileMode(436), modTime: time.Unix(1477192848, 0)} + info := bindataFileInfo{name: "testfiles/testbot.go.tmpl", size: 557, mode: os.FileMode(436), modTime: time.Unix(1488946993, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/setuprunner/setuprunner.go b/setuprunner/setuprunner.go index 52b2abe..ce3d25a 100644 --- a/setuprunner/setuprunner.go +++ b/setuprunner/setuprunner.go @@ -3,24 +3,36 @@ package main import ( "flag" "log" + "time" "github.com/codegp/cloud-persister" - "github.com/codegp/kube-client" + "github.com/codegp/env" + job "github.com/codegp/job-client" "github.com/codegp/test-utils" ) var ( + cp *cloudpersister.CloudPersister testUtils *testutils.TestUtils forceBuild *bool runGame *bool ) func init() { - cp, err := cloudpersister.NewCloudPersister() + var err error + for { + cp, err = cloudpersister.NewCloudPersister() + if err == nil || !env.IsLocal() { + break + } + + log.Printf("Failed to create cloud persister. Confirm DSEmulator is running.\nError: %v", err) + time.Sleep(time.Millisecond * time.Duration(1000)) + } fatalOnErr(err) - kclient, err := kubeclient.NewClient() + jclient, err := job.GetJobClient() fatalOnErr(err) - testUtils = testutils.NewTestUtils(cp, kclient) + testUtils = testutils.NewTestUtils(cp, jclient) forceBuild = flag.Bool("fb", false, "force a new build even if one already exists, bool") runGame = flag.Bool("r", false, "run test game, bool") diff --git a/testfiles/testbot.go.tmpl b/testfiles/testbot.go.tmpl index d2b6ec9..b68adac 100644 --- a/testfiles/testbot.go.tmpl +++ b/testfiles/testbot.go.tmpl @@ -2,10 +2,10 @@ package bot import ( "log" - "botrunner/yielder" - "botrunner/api" - "botrunner/ids" - gobj "botrunner/gameobjects" + "teamrunner/yielder" + "teamrunner/api" + "teamrunner/ids" + gobj "teamrunner/gameobjects" ) func Run(apiClient *api.APIClient, y *yielder.Yielder) { diff --git a/testutils.go b/testutils.go index e16682d..dd60ef5 100644 --- a/testutils.go +++ b/testutils.go @@ -7,18 +7,18 @@ import ( "github.com/codegp/cloud-persister" "github.com/codegp/cloud-persister/models" "github.com/codegp/game-object-types/types" - "github.com/codegp/kube-client" + "github.com/codegp/job-client/jobclient" ) type TestUtils struct { cp *cloudpersister.CloudPersister - kclient *kubeclient.KubeClient + jclient jobclient.JobClient } -func NewTestUtils(cp *cloudpersister.CloudPersister, kclient *kubeclient.KubeClient) *TestUtils { +func NewTestUtils(cp *cloudpersister.CloudPersister, jclient jobclient.JobClient) *TestUtils { return &TestUtils{ cp: cp, - kclient: kclient, + jclient: jclient, } } @@ -35,12 +35,12 @@ func (u *TestUtils) BuildTestGametype(watch bool, force bool) error { return nil } - pod, err := u.kclient.BuildGameType(gameType) + pod, err := u.jclient.BuildGameType(gameType) if err != nil { return err } if watch { - _, err = u.kclient.WatchToCompletion(pod) + err = pod.WatchToCompletion() if err != nil { return err } @@ -82,12 +82,16 @@ func (u *TestUtils) RunTestGame(watch bool) error { if err != nil { return err } - pod, err := u.kclient.StartGame(game) + projs, err := u.cp.GetMultiProject(game.ProjectIDs) + if err != nil { + return err + } + pod, err := u.jclient.StartGame(game, projs) if err != nil { return err } if watch { - _, err = u.kclient.WatchToCompletion(pod) + err = pod.WatchToCompletion() } return err } @@ -130,6 +134,7 @@ func (u *TestUtils) getOrCreateTestGameType() (*models.GameType, bool, error) { if err != nil { return nil, false, err } + log.Println("WR ASS ", testCode) err = u.cp.WriteGameTypeCode(gameType.ID, testCode) if err != nil { return nil, false, err