Skip to content

Commit acb11b2

Browse files
committed
uncomment some tests
1 parent b951dea commit acb11b2

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

internal/integration/env_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ func (env *TestEnv) checkAppStatus(app AppToRun) (bool, error) {
583583
for _, appState := range appStates {
584584
if appState.App == app.AppName {
585585
if appState.Status == "errored" {
586-
return false, fmt.Errorf(appState.Status)
586+
return false, fmt.Errorf(appState.Status) //nolint
587587
}
588588
if appState.Status == "running" {
589589
return true, nil
@@ -599,7 +599,7 @@ func (env *TestEnv) checkVPNClientStatus(app AppToRun) (bool, error) {
599599
return false, err
600600
}
601601
if appState.Status == "errored" {
602-
return false, fmt.Errorf(appState.Status)
602+
return false, fmt.Errorf(appState.Status) //nolint
603603
}
604604
if appState.Status == "running" {
605605
return true, nil

internal/integration/vpn_test.go

+20-21
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,21 @@ func TestVPN(t *testing.T) {
162162
},
163163
Case: testVPNRemoveTransport,
164164
},
165-
// TODO: mrpalide, 0pcom | this test temporary command because of new changes on its subcommand
166-
// {
167-
// Name: "test vpn subcommand list",
168-
// ParticipatingVisorsHostNames: []string{visorVPNServer},
169-
// AppsToRun: []AppToRun{
170-
// {
171-
// VisorHostName: visorVPNServer,
172-
// AppName: skyenv.VPNServerName,
173-
// VisorServerName: "",
174-
// },
175-
// },
176-
// AppArgsToSet: []AppArg{},
177-
// TransportsToAdd: []Transport{},
178-
// Case: testVPNList,
179-
// },
165+
166+
{
167+
Name: "test vpn subcommand list",
168+
ParticipatingVisorsHostNames: []string{visorVPNServer},
169+
AppsToRun: []AppToRun{
170+
{
171+
VisorHostName: visorVPNServer,
172+
AppName: skyenv.VPNServerName,
173+
VisorServerName: "",
174+
},
175+
},
176+
AppArgsToSet: []AppArg{},
177+
TransportsToAdd: []Transport{},
178+
Case: testVPNList,
179+
},
180180
}
181181

182182
RunIntegrationTestCase(t, tt)
@@ -220,12 +220,11 @@ func testVPNRemoveTransport(t *testing.T, env *TestEnv) {
220220
}
221221
}
222222

223-
// TODO: mrpalide, 0pcom | this test temporary command because of new changes on its subcommand
224-
// func testVPNList(t *testing.T, env *TestEnv) {
225-
// vpns, err := env.VPNList(visorVPNServer)
226-
// require.NoError(t, err)
227-
// require.Equal(t, env.visorPKs[visorVPNServer], vpns[0].Addr.PubKey().Hex())
228-
// }
223+
func testVPNList(t *testing.T, env *TestEnv) {
224+
vpns, err := env.VPNList(visorVPNServer)
225+
require.NoError(t, err)
226+
require.Equal(t, env.visorPKs[visorVPNServer], vpns[0].Addr.PubKey().Hex())
227+
}
229228

230229
func testVPNCanRouteThroughSUDPH(t *testing.T, env *TestEnv) {
231230
t.Run("traffic goes through VPN SUDPH", func(t *testing.T) {

0 commit comments

Comments
 (0)