Skip to content

Commit 122e0df

Browse files
committed
Update test to the new API
Signed-off-by: Filipe Laíns <lains@riseup.net>
1 parent 462e0bd commit 122e0df

1 file changed

Lines changed: 5 additions & 29 deletions

File tree

Lib/test/test_build_details.py

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,15 @@
1-
import importlib
21
import json
32
import os
43
import os.path
54
import sys
65
import sysconfig
76
import string
87
import unittest
8+
import sysconfig._build_details as build_details
99
from pathlib import Path
1010

1111
from test.support import is_android, is_apple_mobile, is_wasm32
1212

13-
BASE_PATH = Path(
14-
__file__, # Lib/test/test_build_details.py
15-
'..', # Lib/test
16-
'..', # Lib
17-
'..', # <src/install dir>
18-
).resolve()
19-
MODULE_PATH = BASE_PATH / 'Tools' / 'build' / 'generate-build-details.py'
20-
21-
try:
22-
# Import "generate-build-details.py" as "generate_build_details"
23-
spec = importlib.util.spec_from_file_location(
24-
"generate_build_details", MODULE_PATH
25-
)
26-
generate_build_details = importlib.util.module_from_spec(spec)
27-
sys.modules["generate_build_details"] = generate_build_details
28-
spec.loader.exec_module(generate_build_details)
29-
except (FileNotFoundError, ImportError):
30-
generate_build_details = None
31-
3213

3314
class FormatTestsBase:
3415
@property
@@ -174,23 +155,18 @@ def test_c_api(self):
174155
self.assertTrue(os.path.exists(os.path.join(value['pkgconfig_path'], f'python-{version}.pc')))
175156

176157

177-
@unittest.skipIf(
178-
generate_build_details is None,
179-
"Failed to import generate-build-details"
180-
)
181158
@unittest.skipIf(os.name != 'posix', 'Feature only implemented on POSIX right now')
182159
@unittest.skipIf(is_wasm32, 'Feature not available on WebAssembly builds')
183160
class BuildDetailsRelativePathsTests(unittest.TestCase):
184161
@property
185162
def build_details_absolute_paths(self):
186-
data = generate_build_details.generate_data(schema_version='1.0')
187-
return json.loads(json.dumps(data))
163+
json_data = build_details.BuildDetails.from_interpreter().as_json()
164+
return json.loads(json_data)
188165

189166
@property
190167
def build_details_relative_paths(self):
191-
data = self.build_details_absolute_paths
192-
generate_build_details.make_paths_relative(data, config_path=None)
193-
return data
168+
json_data = build_details.BuildDetails.from_interpreter().as_relocatable().as_json()
169+
return json.loads(json_data)
194170

195171
def test_round_trip(self):
196172
data_abs_path = self.build_details_absolute_paths

0 commit comments

Comments
 (0)