KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only test bundled CA certs on macOS

Browse Source
This commit is contained in:
Kovid Goyal 2021-08-16 22:26:10 +05:30
parent a2e25331a5
commit aa525c68c7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bypy/init_env.py
View File

@ -30,6 +30,7 @@ def initialize_constants():
kitty_constants['appname'] = re.search( kitty_constants['appname'] = re.search(
r'appname: str\s+=\s+(u{0,1})[\'"]([^\'"]+)[\'"]', src r'appname: str\s+=\s+(u{0,1})[\'"]([^\'"]+)[\'"]', src
).group(2) ).group(2)
kitty_constants['cacerts_url'] = 'https://curl.haxx.se/ca/cacert.pem'
return kitty_constants return kitty_constants

3
bypy/macos/__main__.py
View File

@ -185,8 +185,7 @@ class Freeze(object):
def add_ca_certs(self): def add_ca_certs(self):
print('\nDownloading CA certs...') print('\nDownloading CA certs...')
from urllib.request import urlopen from urllib.request import urlopen
ca_certs_url = 'https://curl.haxx.se/ca/cacert.pem' certs = urlopen(kitty_constants['cacerts_url']).read()
certs = urlopen(ca_certs_url).read()
dest = os.path.join(self.contents_dir, 'Resources', 'cacert.pem') dest = os.path.join(self.contents_dir, 'Resources', 'cacert.pem')
with open(dest, 'wb') as f: with open(dest, 'wb') as f:
f.write(certs) f.write(certs)

12
kitty_tests/check_build.py
View File

@ -20,9 +20,9 @@ class TestBuild(BaseTest):
def test_loading_extensions(self) -> None: def test_loading_extensions(self) -> None:
import kitty.fast_data_types as fdt import kitty.fast_data_types as fdt
from kittens.unicode_input import unicode_names
from kittens.choose import subseq_matcher from kittens.choose import subseq_matcher
from kittens.diff import diff_speedup from kittens.diff import diff_speedup
from kittens.unicode_input import unicode_names
del fdt, unicode_names, subseq_matcher, diff_speedup del fdt, unicode_names, subseq_matcher, diff_speedup
def test_loading_shaders(self) -> None: def test_loading_shaders(self) -> None:
@ -31,7 +31,7 @@ class TestBuild(BaseTest):
load_shaders(name) load_shaders(name)
def test_glfw_modules(self) -> None: def test_glfw_modules(self) -> None:
from kitty.constants import is_macos, glfw_path from kitty.constants import glfw_path, is_macos
linux_backends = ['x11'] linux_backends = ['x11']
if not self.is_ci: if not self.is_ci:
linux_backends.append('wayland') linux_backends.append('wayland')
@ -49,12 +49,18 @@ class TestBuild(BaseTest):
self.assertGreater(len(names), 8) self.assertGreater(len(names), 8)
def test_filesystem_locations(self) -> None: def test_filesystem_locations(self) -> None:
from kitty.constants import terminfo_dir, logo_png_file from kitty.constants import logo_png_file, terminfo_dir
self.assertTrue(os.path.isdir(terminfo_dir), f'Terminfo dir: {terminfo_dir}') self.assertTrue(os.path.isdir(terminfo_dir), f'Terminfo dir: {terminfo_dir}')
self.assertTrue(os.path.exists(logo_png_file), f'Logo file: {logo_png_file}') self.assertTrue(os.path.exists(logo_png_file), f'Logo file: {logo_png_file}')
def test_ca_certificates(self): def test_ca_certificates(self):
import ssl import ssl
import sys
if not getattr(sys, 'frozen', False):
self.skipTest('CA certificates are only tested on frozen builds')
from kitty.constants import is_macos
if not is_macos:
self.skipTest('CA certificates are only bundled on macOS')
c = ssl.create_default_context() c = ssl.create_default_context()
self.assertGreater(c.cert_store_stats()['x509_ca'], 2) self.assertGreater(c.cert_store_stats()['x509_ca'], 2)