Browse Source

Fix: test now must use a valid protocol name

Rod Hynes 6 years ago
parent
commit
0a95b4ae8a
1 changed files with 5 additions and 4 deletions
  1. 5 4
      psiphon/common/fragmentor/fragmentor_test.go

+ 5 - 4
psiphon/common/fragmentor/fragmentor_test.go

@@ -52,6 +52,7 @@ func TestFragmentor(t *testing.T) {
 	// before additional data is written, even when running tests with the
 	// before additional data is written, even when running tests with the
 	// race detector.
 	// race detector.
 
 
+	tunnelProtocol := protocol.TUNNEL_PROTOCOL_OBFUSCATED_SSH
 	bytesToFragment := 1 << 15
 	bytesToFragment := 1 << 15
 	minWriteBytes := 1
 	minWriteBytes := 1
 	maxWriteBytes := 512
 	maxWriteBytes := 512
@@ -64,7 +65,7 @@ func TestFragmentor(t *testing.T) {
 	}
 	}
 	_, err = clientParameters.Set("", false, map[string]interface{}{
 	_, err = clientParameters.Set("", false, map[string]interface{}{
 		"FragmentorProbability":              1.0,
 		"FragmentorProbability":              1.0,
-		"FragmentorLimitProtocols":           protocol.TunnelProtocols{},
+		"FragmentorLimitProtocols":           protocol.TunnelProtocols{tunnelProtocol},
 		"FragmentorMinTotalBytes":            bytesToFragment,
 		"FragmentorMinTotalBytes":            bytesToFragment,
 		"FragmentorMaxTotalBytes":            bytesToFragment,
 		"FragmentorMaxTotalBytes":            bytesToFragment,
 		"FragmentorMinWriteBytes":            minWriteBytes,
 		"FragmentorMinWriteBytes":            minWriteBytes,
@@ -72,7 +73,7 @@ func TestFragmentor(t *testing.T) {
 		"FragmentorMinDelay":                 minDelay,
 		"FragmentorMinDelay":                 minDelay,
 		"FragmentorMaxDelay":                 maxDelay,
 		"FragmentorMaxDelay":                 maxDelay,
 		"FragmentorDownstreamProbability":    1.0,
 		"FragmentorDownstreamProbability":    1.0,
-		"FragmentorDownstreamLimitProtocols": protocol.TunnelProtocols{},
+		"FragmentorDownstreamLimitProtocols": protocol.TunnelProtocols{tunnelProtocol},
 		"FragmentorDownstreamMinTotalBytes":  bytesToFragment,
 		"FragmentorDownstreamMinTotalBytes":  bytesToFragment,
 		"FragmentorDownstreamMaxTotalBytes":  bytesToFragment,
 		"FragmentorDownstreamMaxTotalBytes":  bytesToFragment,
 		"FragmentorDownstreamMinWriteBytes":  minWriteBytes,
 		"FragmentorDownstreamMinWriteBytes":  minWriteBytes,
@@ -93,7 +94,7 @@ func TestFragmentor(t *testing.T) {
 			return common.ContextError(err)
 			return common.ContextError(err)
 		}
 		}
 		fragConn := NewConn(
 		fragConn := NewConn(
-			NewDownstreamConfig(clientParameters.Get(), "", nil),
+			NewDownstreamConfig(clientParameters.Get(), tunnelProtocol, nil),
 			func(message string) { t.Logf(message) },
 			func(message string) { t.Logf(message) },
 			conn)
 			conn)
 		defer fragConn.Close()
 		defer fragConn.Close()
@@ -137,7 +138,7 @@ func TestFragmentor(t *testing.T) {
 			return common.ContextError(err)
 			return common.ContextError(err)
 		}
 		}
 		fragConn := NewConn(
 		fragConn := NewConn(
-			NewUpstreamConfig(clientParameters.Get(), "", seed),
+			NewUpstreamConfig(clientParameters.Get(), tunnelProtocol, seed),
 			func(message string) { t.Logf(message) },
 			func(message string) { t.Logf(message) },
 			conn)
 			conn)
 		defer fragConn.Close()
 		defer fragConn.Close()