@@ -759,20 +759,20 @@ var _ = Describe("External Secrets Operator End-to-End test scenarios", Ordered,
759759
760760 AfterAll (func () {
761761 By ("Cleaning up Vault namespace" )
762- safeDelete (exec . Command (
763- "oc" , " delete" ,
762+ safeDelete (ctx ,
763+ "delete" ,
764764 "namespace" , vaultNamespace ,
765765 "--ignore-not-found" ,
766766 "--wait=true" ,
767- ))
767+ )
768768
769769 By ("Cleaning up NetworkPolicy" )
770- safeDelete (exec . Command (
771- "oc" , " delete" ,
770+ safeDelete (ctx ,
771+ "delete" ,
772772 "networkpolicy" , "allow-to-vault-test" ,
773773 "-n" , "external-secrets" ,
774774 "--ignore-not-found" ,
775- ))
775+ )
776776 })
777777
778778 It ("should create secret mentioned in ExternalSecret using the referenced SecretStore" , func () {
@@ -917,10 +917,10 @@ func setupVault(ctx context.Context, client *kubernetes.Clientset) (string, erro
917917
918918 initOut , err := utils .Run (initCmd )
919919 if err != nil {
920- return "" , fmt .Errorf ("vault init failed: %w\n %s " , err , string ( initOut ) )
920+ return "" , fmt .Errorf ("vault init failed: %w" , err )
921921 }
922922
923- By (fmt . Sprintf ( "Vault init output: \n %s" , string ( initOut )) )
923+ By ("Vault initialized successfully" )
924924
925925 // Step 2: Extract keys
926926 lines := strings .Split (string (initOut ), "\n " )
@@ -1062,7 +1062,12 @@ func createVaultTokenSecret(ctx context.Context, client *kubernetes.Clientset, t
10621062 return err
10631063}
10641064
1065- func safeDelete (cmd * exec.Cmd ) {
1065+ func safeDelete (ctx context.Context , args ... string ) {
1066+ ctxTimeout , cancel := context .WithTimeout (ctx , 2 * time .Minute )
1067+ defer cancel ()
1068+
1069+ cmd := exec .CommandContext (ctxTimeout , "oc" , args ... )
1070+
10661071 out , err := cmd .CombinedOutput ()
10671072 if err != nil {
10681073 By (fmt .Sprintf ("Cleanup error: %s" , string (out )))
0 commit comments