mirror of https://github.com/fatedier/frp
				
				
				
			update ci
							parent
							
								
									1925847ef8
								
							
						
					
					
						commit
						d1f1c72a55
					
				| 
						 | 
				
			
			@ -19,7 +19,7 @@ func TestCmdTcp(t *testing.T) {
 | 
			
		|||
	if assert.NoError(err) {
 | 
			
		||||
		defer s.Stop()
 | 
			
		||||
	}
 | 
			
		||||
	time.Sleep(100 * time.Millisecond)
 | 
			
		||||
	time.Sleep(200 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	c := util.NewProcess(consts.FRPC_BIN_PATH, []string{"tcp", "-s", "127.0.0.1:20000", "-t", "123", "-u", "test",
 | 
			
		||||
		"-l", "10701", "-r", "20801", "-n", "tcp_test"})
 | 
			
		||||
| 
						 | 
				
			
			@ -27,7 +27,7 @@ func TestCmdTcp(t *testing.T) {
 | 
			
		|||
	if assert.NoError(err) {
 | 
			
		||||
		defer c.Stop()
 | 
			
		||||
	}
 | 
			
		||||
	time.Sleep(250 * time.Millisecond)
 | 
			
		||||
	time.Sleep(500 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	res, err := util.SendTcpMsg("127.0.0.1:20801", consts.TEST_TCP_ECHO_STR)
 | 
			
		||||
	assert.NoError(err)
 | 
			
		||||
| 
						 | 
				
			
			@ -43,7 +43,7 @@ func TestCmdUdp(t *testing.T) {
 | 
			
		|||
	if assert.NoError(err) {
 | 
			
		||||
		defer s.Stop()
 | 
			
		||||
	}
 | 
			
		||||
	time.Sleep(100 * time.Millisecond)
 | 
			
		||||
	time.Sleep(200 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	c := util.NewProcess(consts.FRPC_BIN_PATH, []string{"udp", "-s", "127.0.0.1:20000", "-t", "123", "-u", "test",
 | 
			
		||||
		"-l", "10702", "-r", "20802", "-n", "udp_test"})
 | 
			
		||||
| 
						 | 
				
			
			@ -51,7 +51,7 @@ func TestCmdUdp(t *testing.T) {
 | 
			
		|||
	if assert.NoError(err) {
 | 
			
		||||
		defer c.Stop()
 | 
			
		||||
	}
 | 
			
		||||
	time.Sleep(250 * time.Millisecond)
 | 
			
		||||
	time.Sleep(500 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	res, err := util.SendUdpMsg("127.0.0.1:20802", consts.TEST_UDP_ECHO_STR)
 | 
			
		||||
	assert.NoError(err)
 | 
			
		||||
| 
						 | 
				
			
			@ -67,7 +67,7 @@ func TestCmdHttp(t *testing.T) {
 | 
			
		|||
	if assert.NoError(err) {
 | 
			
		||||
		defer s.Stop()
 | 
			
		||||
	}
 | 
			
		||||
	time.Sleep(100 * time.Millisecond)
 | 
			
		||||
	time.Sleep(200 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	c := util.NewProcess(consts.FRPC_BIN_PATH, []string{"http", "-s", "127.0.0.1:20000", "-t", "123", "-u", "test",
 | 
			
		||||
		"-n", "udp_test", "-l", "10704", "--custom_domain", "127.0.0.1"})
 | 
			
		||||
| 
						 | 
				
			
			@ -75,7 +75,7 @@ func TestCmdHttp(t *testing.T) {
 | 
			
		|||
	if assert.NoError(err) {
 | 
			
		||||
		defer c.Stop()
 | 
			
		||||
	}
 | 
			
		||||
	time.Sleep(250 * time.Millisecond)
 | 
			
		||||
	time.Sleep(500 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	code, body, _, err := util.SendHttpMsg("GET", "http://127.0.0.1:20001", "", nil, "")
 | 
			
		||||
	if assert.NoError(err) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -56,14 +56,14 @@ func TestReconnect(t *testing.T) {
 | 
			
		|||
		defer frpsProcess.Stop()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	time.Sleep(100 * time.Millisecond)
 | 
			
		||||
	time.Sleep(200 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	frpcProcess := util.NewProcess(consts.FRPC_BIN_PATH, []string{"-c", frpcCfgPath})
 | 
			
		||||
	err = frpcProcess.Start()
 | 
			
		||||
	if assert.NoError(err) {
 | 
			
		||||
		defer frpcProcess.Stop()
 | 
			
		||||
	}
 | 
			
		||||
	time.Sleep(250 * time.Millisecond)
 | 
			
		||||
	time.Sleep(500 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	// test tcp
 | 
			
		||||
	res, err := util.SendTcpMsg("127.0.0.1:20801", consts.TEST_TCP_ECHO_STR)
 | 
			
		||||
| 
						 | 
				
			
			@ -72,7 +72,7 @@ func TestReconnect(t *testing.T) {
 | 
			
		|||
 | 
			
		||||
	// stop frpc
 | 
			
		||||
	frpcProcess.Stop()
 | 
			
		||||
	time.Sleep(100 * time.Millisecond)
 | 
			
		||||
	time.Sleep(200 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	// test tcp, expect failed
 | 
			
		||||
	_, err = util.SendTcpMsg("127.0.0.1:20801", consts.TEST_TCP_ECHO_STR)
 | 
			
		||||
| 
						 | 
				
			
			@ -84,7 +84,7 @@ func TestReconnect(t *testing.T) {
 | 
			
		|||
	if assert.NoError(err) {
 | 
			
		||||
		defer newFrpcProcess.Stop()
 | 
			
		||||
	}
 | 
			
		||||
	time.Sleep(250 * time.Millisecond)
 | 
			
		||||
	time.Sleep(500 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	// test tcp
 | 
			
		||||
	res, err = util.SendTcpMsg("127.0.0.1:20801", consts.TEST_TCP_ECHO_STR)
 | 
			
		||||
| 
						 | 
				
			
			@ -93,7 +93,7 @@ func TestReconnect(t *testing.T) {
 | 
			
		|||
 | 
			
		||||
	// stop frps
 | 
			
		||||
	frpsProcess.Stop()
 | 
			
		||||
	time.Sleep(100 * time.Millisecond)
 | 
			
		||||
	time.Sleep(200 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	// test tcp, expect failed
 | 
			
		||||
	_, err = util.SendTcpMsg("127.0.0.1:20801", consts.TEST_TCP_ECHO_STR)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -94,7 +94,7 @@ func TestReload(t *testing.T) {
 | 
			
		|||
		defer frpsProcess.Stop()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	time.Sleep(100 * time.Millisecond)
 | 
			
		||||
	time.Sleep(200 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	frpcProcess := util.NewProcess(consts.FRPC_BIN_PATH, []string{"-c", frpcCfgPath})
 | 
			
		||||
	err = frpcProcess.Start()
 | 
			
		||||
| 
						 | 
				
			
			@ -102,7 +102,7 @@ func TestReload(t *testing.T) {
 | 
			
		|||
		defer frpcProcess.Stop()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	time.Sleep(250 * time.Millisecond)
 | 
			
		||||
	time.Sleep(500 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	// test tcp1
 | 
			
		||||
	res, err := util.SendTcpMsg("127.0.0.1:20801", consts.TEST_TCP_ECHO_STR)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -55,7 +55,7 @@ func TestConfTemplate(t *testing.T) {
 | 
			
		|||
		defer frpsProcess.Stop()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	time.Sleep(100 * time.Millisecond)
 | 
			
		||||
	time.Sleep(200 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	frpcProcess := util.NewProcess("env", []string{"FRP_TOKEN=123456", "TCP_REMOTE_PORT=20801", consts.FRPC_BIN_PATH, "-c", frpcCfgPath})
 | 
			
		||||
	err = frpcProcess.Start()
 | 
			
		||||
| 
						 | 
				
			
			@ -63,7 +63,7 @@ func TestConfTemplate(t *testing.T) {
 | 
			
		|||
		defer frpcProcess.Stop()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	time.Sleep(250 * time.Millisecond)
 | 
			
		||||
	time.Sleep(500 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	// test tcp1
 | 
			
		||||
	res, err := util.SendTcpMsg("127.0.0.1:20801", consts.TEST_TCP_ECHO_STR)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -55,14 +55,14 @@ func TestTlsOverTCP(t *testing.T) {
 | 
			
		|||
		defer frpsProcess.Stop()
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	time.Sleep(100 * time.Millisecond)
 | 
			
		||||
	time.Sleep(200 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	frpcProcess := util.NewProcess(consts.FRPC_BIN_PATH, []string{"-c", frpcCfgPath})
 | 
			
		||||
	err = frpcProcess.Start()
 | 
			
		||||
	if assert.NoError(err) {
 | 
			
		||||
		defer frpcProcess.Stop()
 | 
			
		||||
	}
 | 
			
		||||
	time.Sleep(250 * time.Millisecond)
 | 
			
		||||
	time.Sleep(500 * time.Millisecond)
 | 
			
		||||
 | 
			
		||||
	// test tcp
 | 
			
		||||
	res, err := util.SendTcpMsg("127.0.0.1:20801", consts.TEST_TCP_ECHO_STR)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue