fixing the tests

realvnc-labs · Aug 4, 2022 · 44fc35b · 44fc35b
1 parent 585e323
commit 44fc35b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/internal/pkg/controllers/tunnel_test.go b/internal/pkg/controllers/tunnel_test.go
@@ -253,7 +253,6 @@ func TestTunnelCreateWithClientID(t *testing.T) {
 	expectedOutput := `{
 		"id": "123",
 		"client_id": "334",
-		"client_name": "",
 		"lhost": "lohost1",
 		"lport": "3300",
 		"rhost": "rhost2",
@@ -319,7 +318,6 @@ func TestTunnelCreateWithPortDiscovery(t *testing.T) {
 	expectedOutput := `{
 		"id": "777",
 		"client_id": "1313",
-		"client_name": "",
 		"lhost": "lohost44",
 		"lport": "",
 		"rhost": "",

diff --git a/internal/pkg/output/tunnel_test.go b/internal/pkg/output/tunnel_test.go
@@ -19,14 +19,14 @@ func TestRenderTunnels(t *testing.T) {
 		{
 			Format: FormatHuman,
 			ExpectedOutput: `Tunnels
-ID   CLIENT ID CLIENT NAME LOCAL HOST LOCAL PORT REMOTE HOST REMOTE PORT LOCAL PORT RAND SCHEME ACL     TIMEOUT 
-id22                       lhost      123        rhost       124         false           ssh    0.0.0.0 33      
+ID   CLIENT ID CLIENT NAME   LOCAL HOST LOCAL PORT REMOTE HOST REMOTE PORT LOCAL PORT RAND SCHEME ACL     TIMEOUT 
+id22           RemoteMachine lhost      123        rhost       124         false           ssh    0.0.0.0 33      
 `,
 			ColCountToGive: 150,
 		},
 		{
 			Format: FormatJSON,
-			ExpectedOutput: `[{"id":"id22","client_id":"","client_name":"","lhost":"lhost","lport":"123","rhost":"rhost","rport":"124","lport_random":false,"scheme":"ssh","acl":"0.0.0.0","idle_timeout_minutes":33}]
+			ExpectedOutput: `[{"id":"id22","client_id":"","client_name":"RemoteMachine","lhost":"lhost","lport":"123","rhost":"rhost","rport":"124","lport_random":false,"scheme":"ssh","acl":"0.0.0.0","idle_timeout_minutes":33}]
 `,
 			ColCountToGive: 10,
 		},
@@ -36,7 +36,7 @@ id22                       lhost      123        rhost       124         false
   {
     "id": "id22",
     "client_id": "",
-    "client_name": "",
+    "client_name": "RemoteMachine",
     "lhost": "lhost",
     "lport": "123",
     "rhost": "rhost",
@@ -54,7 +54,7 @@ id22                       lhost      123        rhost       124         false
 			Format: FormatYAML,
 			ExpectedOutput: `- id: id22
   client_id: ""
-  client_name: ""
+  client_name: RemoteMachine
   local_host: lhost
   local_port: "123"
   remote_host: rhost
@@ -71,6 +71,7 @@ id22                       lhost      123        rhost       124         false
 	tunnels := []*models.Tunnel{
 		{
 			ID:              "id22",
+			ClientName:      "RemoteMachine",
 			Lhost:           "lhost",
 			Lport:           "123",
 			Rhost:           "rhost",
@@ -134,7 +135,7 @@ USAGE:             ssh -p 123 123.22.22.33 -l root
 		},
 		{
 			Format: FormatJSON,
-			ExpectedOutput: `{"id":"id22","client_id":"","client_name":"","lhost":"lhost","lport":"123","rhost":"rhost","rport":"124","lport_random":false,"scheme":"ssh","acl":"0.0.0.0","usage":"ssh -p 123 123.22.22.33 -l root","idle_timeout_minutes":7}
+			ExpectedOutput: `{"id":"id22","client_id":"","client_name":"RemoteMachine","lhost":"lhost","lport":"123","rhost":"rhost","rport":"124","lport_random":false,"scheme":"ssh","acl":"0.0.0.0","usage":"ssh -p 123 123.22.22.33 -l root","idle_timeout_minutes":7}
 `,
 			ColCountToGive: 10,
 		},
@@ -143,7 +144,7 @@ USAGE:             ssh -p 123 123.22.22.33 -l root
 			ExpectedOutput: `{
   "id": "id22",
   "client_id": "",
-  "client_name": "",
+  "client_name": "RemoteMachine",
   "lhost": "lhost",
   "lport": "123",
   "rhost": "rhost",
@@ -161,7 +162,7 @@ USAGE:             ssh -p 123 123.22.22.33 -l root
 			Format: FormatYAML,
 			ExpectedOutput: `id: id22
 client_id: ""
-client_name: ""
+client_name: RemoteMachine
 local_host: lhost
 local_port: "123"
 remote_host: rhost
@@ -177,6 +178,7 @@ idle_timeout_minutes: 7
 	}
 	tunnel := &models.TunnelCreated{
 		ID:              "id22",
+		ClientName:      "RemoteMachine",
 		Lhost:           "lhost",
 		Lport:           "123",
 		Rhost:           "rhost",