More testing needed on this branch (#42)

Merge branch 'RELEASE_3_12' into 3_12_testing

# Conflicts:
#	R/zzz.R

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: biomaRt
-Version: 2.46.2
+Version: 2.46.2-1
 Title: Interface to BioMart databases (i.e. Ensembl)
 Authors@R: c(person("Steffen", "Durinck", role = c("aut"), 
             email = "biomartdev@gmail.com"), 
@@ -8,7 +8,8 @@ Authors@R: c(person("Steffen", "Durinck", role = c("aut"),
         person("Francois", "Pepin", role="ctb"),
         person(given = "Vince S", family = "Buffalo", role="ctb"),
         person("Mike", "Smith", role=c("ctb", "cre"), 
-            email = "grimbough@gmail.com"))
+            email = "grimbough@gmail.com",
+            comment = c(ORCID = "0000-0002-7800-3848")))
 Depends: methods
 Imports: utils, XML, AnnotationDbi, progress, stringr, httr,
         openssl, BiocFileCache, rappdirs, xml2

R/zzz.R

@@ -16,21 +16,29 @@
         message("Failed test 1: ", test[1])
         new_config <- httr::config(ssl_cipher_list = "DEFAULT@SECLEVEL=1")
 
-      } else if(grepl(x = test[1], ## two reported error messages solved with the same setting
+      } else if (grepl(x = test[1], ## two reported error messages solved with the same setting
                       pattern = "(unable to get local issuer certificate)|(server certificate verification failed)")) {
         message("Failed test 2: ", test[1])
         new_config <- httr::config(ssl_verifypeer = FALSE)
+      } else if (grepl(x = test[1], ## We end up here if the test timed out
+                       pattern = "Timeout was reached")) {
+        ## Time out is unfortunate, but lets not inform the user since it might not be a problem.
+        ## Quit the testing and proceed
+        break; 
       } else {
-        message("Unknown error encountered: ", test[1])
-        ## We can't fix this, so just quit
-        break;
+        message("Possible SSL connectivity problems detected.\n",
+                "Please report this issue at https://github.com/grimbough/biomaRt/issues\n",
+                test[1])
+        ## We can't fix this, so just quit the tests
+        return(invisible(0))
       }
       httr::set_config(new_config, override = FALSE)
     } else {
-      ## no need to loop twice if there's no error
-      break;
+      ## no need to loop again if there's no error
+      return(invisible(0))
     }
   }
+  return(invisible(0))
 }