Преглед на файлове

Merge pull request #8554 from bket/openbsd_vagrant

Fix issues seen with the OpenBSD vagrant box
TW преди 7 месеца
родител
ревизия
d1b2884204
променени са 2 файла, в които са добавени 7 реда и са изтрити 0 реда
  1. 1 0
      Vagrantfile
  2. 6 0
      src/borg/logger.py

+ 1 - 0
Vagrantfile

@@ -73,6 +73,7 @@ end
 
 def packages_openbsd
   return <<-EOF
+    echo "https://ftp.eu.openbsd.org/pub/OpenBSD" > /etc/installurl
     pkg_add bash
     chsh -s bash vagrant
     pkg_add xxhash

+ 6 - 0
src/borg/logger.py

@@ -117,6 +117,12 @@ class JSONProgressFormatter(logging.Formatter):
 # warnings.filterwarnings('ignore', r'... regex for warning message to ignore ...')
 
 
+# we do not want that urllib spoils test output with LibreSSL related warnings on OpenBSD.
+# NotOpenSSLWarning: urllib3 v2 only supports OpenSSL 1.1.1+,
+#                    currently the 'ssl' module is compiled with 'LibreSSL 3.8.2'.
+warnings.filterwarnings("ignore", message=r".*urllib3 v2 only supports OpenSSL.*")
+
+
 def _log_warning(message, category, filename, lineno, file=None, line=None):
     # for warnings, we just want to use the logging system, not stderr or other files
     msg = f"{filename}:{lineno}: {category.__name__}: {message}"