Skip to content

Commit 348f6ea

Browse files
committed
fix: fix compile error of test code
1 parent 6b5c581 commit 348f6ea

File tree

1 file changed

+26
-4
lines changed

1 file changed

+26
-4
lines changed

gateway/self_upgrade_test.go

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ import (
55
"os"
66
"strings"
77
"testing"
8+
9+
"github.com/pkg/errors"
10+
"github.com/vim-volt/volt/config"
11+
"github.com/vim-volt/volt/lockjson"
812
)
913

1014
func TestVoltSelfUpgrade(t *testing.T) {
@@ -30,8 +34,7 @@ func testVoltSelfUpgradeCheckFromOldVer(t *testing.T) {
3034

3135
var err *Error
3236
out := captureOutput(t, func() {
33-
args := []string{"volt", "self-upgrade", "-check"}
34-
err = Run(args, DefaultRunner)
37+
err = runVolt(t, "self-upgrade", "-check")
3538
})
3639

3740
if err != nil {
@@ -46,8 +49,7 @@ func testVoltSelfUpgradeCheckFromOldVer(t *testing.T) {
4649
func testVoltSelfUpgradeCheckFromCurrentVer(t *testing.T) {
4750
var err *Error
4851
out := captureOutput(t, func() {
49-
args := []string{"volt", "self-upgrade", "-check"}
50-
err = Run(args, DefaultRunner)
52+
err = runVolt(t, "self-upgrade", "-check")
5153
})
5254

5355
if err != nil {
@@ -83,3 +85,23 @@ func captureOutput(t *testing.T, f func()) string {
8385
os.Stderr = oldStderr
8486
return <-outCh
8587
}
88+
89+
func runVolt(t *testing.T, cmd string, args ...string) *Error {
90+
c := LookUpCmd(cmd)
91+
if c == nil {
92+
t.Fatal("unknown command '" + cmd + "'")
93+
}
94+
lockJSON, err := lockjson.Read()
95+
if err != nil {
96+
t.Fatal(errors.Wrap(err, "failed to read lock.json").Error())
97+
}
98+
cfg, err := config.Read()
99+
if err != nil {
100+
t.Fatal(errors.Wrap(err, "failed to read config.toml").Error())
101+
}
102+
return c.Run(&CmdContext{
103+
Args: args,
104+
LockJSON: lockJSON,
105+
Config: cfg,
106+
})
107+
}

0 commit comments

Comments
 (0)