|
24 | 24 | SRC_PATH = os.path.join(get_repo_root(), 'src') |
25 | 25 |
|
26 | 26 | # Extensions to skip dep. check. Aim to keep this list empty. |
27 | | -SKIP_DEP_CHECK = ['azure_cli_iot_ext'] |
| 27 | +SKIP_DEP_CHECK = ['azure-cli-iot-ext'] |
28 | 28 |
|
29 | 29 |
|
30 | 30 | def catch_dup_keys(pairs): |
@@ -102,7 +102,7 @@ def get_ext_metadata(ext_dir, ext_file, ext_name): |
102 | 102 | metadata.update(azext_metadata) |
103 | 103 | for dist_info_dirname in dist_info_dirs: |
104 | 104 | parsed_dist_info_dir = WHEEL_INFO_RE(dist_info_dirname) |
105 | | - if parsed_dist_info_dir and parsed_dist_info_dir.groupdict().get('name') == ext_name: |
| 105 | + if parsed_dist_info_dir and parsed_dist_info_dir.groupdict().get('name') == ext_name.replace('-', '_'): |
106 | 106 | whl_metadata_filepath = os.path.join(ext_dir, dist_info_dirname, WHL_METADATA_FILENAME) |
107 | 107 | if os.path.isfile(whl_metadata_filepath): |
108 | 108 | with open(whl_metadata_filepath) as f: |
@@ -134,11 +134,15 @@ def test_format_extensions_value(self): |
134 | 134 |
|
135 | 135 | def test_extension_filenames(self): |
136 | 136 | for ext_name, exts in self.index['extensions'].items(): |
| 137 | + self.assertEqual(ext_name.find('_'), -1, "Extension names should not contain underscores. " |
| 138 | + "Found {}".format(ext_name)) |
137 | 139 | for item in exts: |
138 | 140 | self.assertTrue(item['filename'].endswith('.whl'), |
139 | 141 | "Filename {} must end with .whl".format(item['filename'])) |
140 | | - self.assertTrue(item['filename'].startswith(ext_name), |
141 | | - "Filename {} must start with {}".format(item['filename'], ext_name)) |
| 142 | + self.assertEqual(ext_name, item['metadata']['name'], |
| 143 | + "Extension name mismatch in extensions['{}']. " |
| 144 | + "Found an extension in the list with name " |
| 145 | + "{}".format(ext_name, item['metadata']['name'])) |
142 | 146 | parsed_filename = WHEEL_INFO_RE(item['filename']) |
143 | 147 | p = parsed_filename.groupdict() |
144 | 148 | self.assertTrue(p.get('name'), "Can't get name for {}".format(item['filename'])) |
@@ -224,6 +228,8 @@ def test_source_wheels(self): |
224 | 228 | source_extensions = [os.path.join(SRC_PATH, n) for n in os.listdir(SRC_PATH) |
225 | 229 | if os.path.isdir(os.path.join(SRC_PATH, n))] |
226 | 230 | for s in source_extensions: |
| 231 | + if not os.path.isfile(os.path.join(s, 'setup.py')): |
| 232 | + continue |
227 | 233 | try: |
228 | 234 | subprocess.check_call(['python', 'setup.py', 'bdist_wheel', '-q', '-d', built_whl_dir], |
229 | 235 | cwd=s, stdout=PIPE, stderr=PIPE) |
|
0 commit comments