v30.3-roots.1 · Commit 65: [PATCH 65/68] fix(release): collect Homebrew dependency unions with supported flags
ci/test/test_runner_release_notices.py
Before: ci/test/test_runner_release_notices.py · After: ci/test/test_runner_release_notices.py
File metadata
index b4a02a66cfbb0a7fd7e692edec7418177fcd65c7..cc48d05fdda5d000038eaf2eeae62112603f8050 100755
Download original patch · Release notes
Diff rows 1–22 of 22. Line numbers refer to the original before/after files.
+ Added− RemovedUnmarked lines are context.
Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.
ci/test/test_runner_release_notices.py
CHANGED
|
@@ -81,7 +81,14 @@ class RunnerNoticeTest(unittest.TestCase):
|
|
| 81 |
'versions': {'stable': '1.88.0'}, 'urls': {'stable': {'url': 'https://example.invalid/source', 'checksum': checksum}}}
|
| 82 |
def execute(*args):
|
| 83 |
if args[:2] == ('brew', 'deps'):
|
| 84 |
-
return 'boost\nca-certificates\nqt\nqtbase\nqtwebengine'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 85 |
if args[:2] == ('brew', 'info'):
|
| 86 |
if args[-1] == 'boost':
|
| 87 |
return json.dumps({'formulae': [formula]})
|
|
@@ -96,6 +103,7 @@ class RunnerNoticeTest(unittest.TestCase):
|
|
| 96 |
receipt = json.loads(Path(result['boost']['evidence']).read_text())
|
| 97 |
self.assertTrue(receipt['installed_receipt']['built_as_bottle'])
|
| 98 |
self.assertEqual(result['sqlite']['role'], 'system-library')
|
|
|
|
| 99 |
self.assertIn('qt', result)
|
| 100 |
self.assertNotIn('ca-certificates', result)
|
| 101 |
self.assertNotIn('qtwebengine', result)
|
|
|
|
| 81 |
'versions': {'stable': '1.88.0'}, 'urls': {'stable': {'url': 'https://example.invalid/source', 'checksum': checksum}}}
|
| 82 |
def execute(*args):
|
| 83 |
if args[:2] == ('brew', 'deps'):
|
| 84 |
+
# Homebrew recurses by default; multi-formula intersection
|
| 85 |
+
# drops dependencies that only one requested formula needs.
|
| 86 |
+
self.assertEqual(args, ('brew', 'deps', '--installed', '--union',
|
| 87 |
+
'qt@6', 'boost', 'libevent', 'zeromq',
|
| 88 |
+
'qrencode', 'miniupnpc', 'capnp'))
|
| 89 |
+
required = runner.notices.required_components('darwin-arm64') - {'qt', 'sqlite', 'openssl', 'icu'}
|
| 90 |
+
return '\n'.join(sorted(required | {'ca-certificates', 'qt', 'qtbase',
|
| 91 |
+
'qtwebengine', 'openssl@3', 'icu4c@78'}))
|
| 92 |
if args[:2] == ('brew', 'info'):
|
| 93 |
if args[-1] == 'boost':
|
| 94 |
return json.dumps({'formulae': [formula]})
|
|
|
|
| 103 |
receipt = json.loads(Path(result['boost']['evidence']).read_text())
|
| 104 |
self.assertTrue(receipt['installed_receipt']['built_as_bottle'])
|
| 105 |
self.assertEqual(result['sqlite']['role'], 'system-library')
|
| 106 |
+
self.assertTrue(runner.notices.required_components('darwin-arm64') <= result.keys())
|
| 107 |
self.assertIn('qt', result)
|
| 108 |
self.assertNotIn('ca-certificates', result)
|
| 109 |
self.assertNotIn('qtwebengine', result)
|