checkpoint

mine
derailed 2020-10-26 21:28:36 -06:00
parent 81820b6459
commit 7a920a4ed6
6 changed files with 15 additions and 18 deletions

View File

@ -79,17 +79,14 @@ func run(cmd *cobra.Command, args []string) {
zerolog.SetGlobalLevel(parseLevel(*k9sFlags.LogLevel))
app := view.NewApp(loadConfiguration())
{
defer app.BailOut()
if err := app.Init(version, *k9sFlags.RefreshRate); err != nil {
panic(fmt.Sprintf("app init failed -- %v", err))
}
if err := app.Run(); err != nil {
panic(fmt.Sprintf("app run failed %v", err))
}
if view.ExitStatus != "" {
panic(fmt.Sprintf("view exit status %s", view.ExitStatus))
}
if err := app.Init(version, *k9sFlags.RefreshRate); err != nil {
panic(fmt.Sprintf("app init failed -- %v", err))
}
if err := app.Run(); err != nil {
panic(fmt.Sprintf("app run failed %v", err))
}
if view.ExitStatus != "" {
panic(fmt.Sprintf("view exit status %s", view.ExitStatus))
}
}

View File

@ -35,8 +35,8 @@ func TestContainer(t *testing.T) {
"false",
"0",
"off:off",
"20m/20m",
"100Mi/100Mi",
"20m:20m",
"100Mi:100Mi",
"10m",
"20Mi",
"50",

View File

@ -159,7 +159,7 @@ func TestPodRender(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, "default/nginx", r.ID)
e := render.Fields{"default", "nginx", "●", "1/1", "0", "Running", "100m/-", "70Mi/170Mi", "10m", "10Mi", "10", "14", render.NAValue, "5", "172.17.0.6", "minikube", "BE"}
e := render.Fields{"default", "nginx", "●", "1/1", "0", "Running", "100m:n/a", "70Mi:170Mi", "10m", "10Mi", "10", "14", render.NAValue, "5", "172.17.0.6", "minikube", "BE"}
assert.Equal(t, e, r.Fields[:17])
}
@ -190,7 +190,7 @@ func TestPodInitRender(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, "default/nginx", r.ID)
e := render.Fields{"default", "nginx", "●", "1/1", "0", "Init:0/1", "200m/-", "140Mi/340Mi", "10m", "10Mi", "5", "7", render.NAValue, "2", "172.17.0.6", "minikube", "BE"}
e := render.Fields{"default", "nginx", "●", "1/1", "0", "Init:0/1", "200m:n/a", "140Mi:340Mi", "10m", "10Mi", "5", "7", render.NAValue, "2", "172.17.0.6", "minikube", "BE"}
assert.Equal(t, e, r.Fields[:17])
}

View File

@ -136,6 +136,8 @@ func (a *App) layout(ctx context.Context, version string) {
}
func (a *App) initSignals() {
var s *string
fmt.Println(strings.Compare("blee", *s))
sig := make(chan os.Signal, 1)
signal.Notify(sig, syscall.SIGHUP)

View File

@ -1,7 +1,6 @@
package view_test
import (
"fmt"
"testing"
"github.com/derailed/k9s/internal/client"
@ -14,6 +13,5 @@ func TestDeploy(t *testing.T) {
assert.Nil(t, v.Init(makeCtx()))
assert.Equal(t, "Deployments", v.Name())
fmt.Println(v.Hints())
assert.Equal(t, 14, len(v.Hints()))
}

View File

@ -34,7 +34,7 @@ func TestLogViewNav(t *testing.T) {
v.toggleAutoScrollCmd(nil)
r, _ := v.Logs().GetScrollOffset()
assert.Equal(t, 0, r)
assert.Equal(t, -1, r)
}
func TestLogViewClear(t *testing.T) {