mirror of
				https://github.com/juanfont/headscale.git
				synced 2025-10-28 10:51:44 +01:00 
			
		
		
		
	Corrected integration tests and github test-integration workflow
This commit is contained in:
		
							parent
							
								
									3aa93bc7f4
								
							
						
					
					
						commit
						a9dbbd349a
					
				
							
								
								
									
										3
									
								
								.github/workflows/test-integration.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.github/workflows/test-integration.yaml
									
									
									
									
										vendored
									
									
								
							| @ -24,16 +24,19 @@ jobs: | ||||
|           - TestOIDC024UserCreation | ||||
|           - TestAuthWebFlowAuthenticationPingAll | ||||
|           - TestAuthWebFlowLogoutAndRelogin | ||||
|           - TestAuthNodeApproval | ||||
|           - TestUserCommand | ||||
|           - TestPreAuthKeyCommand | ||||
|           - TestPreAuthKeyCommandWithoutExpiry | ||||
|           - TestPreAuthKeyCommandReusableEphemeral | ||||
|           - TestPreAuthKeyCommandPreApproved | ||||
|           - TestPreAuthKeyCorrectUserLoggedInCommand | ||||
|           - TestApiKeyCommand | ||||
|           - TestNodeTagCommand | ||||
|           - TestNodeAdvertiseTagCommand | ||||
|           - TestNodeCommand | ||||
|           - TestNodeExpireCommand | ||||
|           - TestNodeApproveCommand | ||||
|           - TestNodeRenameCommand | ||||
|           - TestNodeMoveCommand | ||||
|           - TestPolicyCommand | ||||
|  | ||||
| @ -2,6 +2,7 @@ package integration | ||||
| 
 | ||||
| import ( | ||||
| 	"context" | ||||
| 	"crypto/tls" | ||||
| 	"fmt" | ||||
| 	v1 "github.com/juanfont/headscale/gen/go/headscale/v1" | ||||
| 	"github.com/juanfont/headscale/integration/hsic" | ||||
| @ -39,6 +40,8 @@ func TestAuthNodeApproval(t *testing.T) { | ||||
| 	err = scenario.CreateHeadscaleEnv( | ||||
| 		spec, | ||||
| 		hsic.WithTestName("approval"), | ||||
| 		hsic.WithTLS(), | ||||
| 		hsic.WithHostnameAsServerURL(), | ||||
| 		hsic.WithManualApproveNewNode(), | ||||
| 	) | ||||
| 	assertNoErrHeadscaleEnv(t, err) | ||||
| @ -236,7 +239,16 @@ func (s *AuthApprovalScenario) runHeadscaleRegister(userStr string, loginURL *ur | ||||
| 	loginURL.Host = fmt.Sprintf("%s:8080", headscale.GetIP()) | ||||
| 	loginURL.Scheme = "http" | ||||
| 
 | ||||
| 	httpClient := &http.Client{} | ||||
| 	if len(headscale.GetCert()) > 0 { | ||||
| 		loginURL.Scheme = "https" | ||||
| 	} | ||||
| 
 | ||||
| 	insecureTransport := &http.Transport{ | ||||
| 		TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, // nolint
 | ||||
| 	} | ||||
| 	httpClient := &http.Client{ | ||||
| 		Transport: insecureTransport, | ||||
| 	} | ||||
| 	ctx := context.Background() | ||||
| 	req, _ := http.NewRequestWithContext(ctx, http.MethodGet, loginURL.String(), nil) | ||||
| 	resp, err := httpClient.Do(req) | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user