Skip to content

Commit

Permalink
Remove duplicateFileNames
Browse files Browse the repository at this point in the history
  • Loading branch information
@timneutkens
timneutkens committed Sep 25, 2023
1 parent 8ec91b0 commit a908bd3
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 139 deletions.
59 changes: 24 additions & 35 deletions test/build-turbopack-tests-manifest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,32 +41,31 @@ async function updatePassingTests() {
const runtimeError = result.data.numRuntimeErrorTestSuites > 0
for (const testResult of result.data.testResults) {
const filepath = stripWorkingPath(testResult.name)
for (const file of duplicateFileNames(filepath)) {
if (SKIPPED_TEST_SUITES.has(file)) continue
const fileResults = (passing[file] ??= {
passed: [],
failed: [],
pending: [],
runtimeError,
})

let initializationFailed = false
for (const testCase of testResult.assertionResults) {
let { fullName, status } = testCase
if (
status === 'failed' &&
INITIALIZING_TEST_CASES.some((name) => fullName.includes(name))
) {
initializationFailed = true
} else if (initializationFailed) {
status = 'failed'
}
const statusArray = fileResults[status]
if (!statusArray) {
throw new Error(`unexpected status "${status}"`)
}
statusArray.push(fullName)

if (SKIPPED_TEST_SUITES.has(filepath)) continue
const fileResults = (passing[filepath] ??= {
passed: [],
failed: [],
pending: [],
runtimeError,
})

let initializationFailed = false
for (const testCase of testResult.assertionResults) {
let { fullName, status } = testCase
if (
status === 'failed' &&
INITIALIZING_TEST_CASES.some((name) => fullName.includes(name))
) {
initializationFailed = true
} else if (initializationFailed) {
status = 'failed'
}
const statusArray = fileResults[status]
if (!statusArray) {
throw new Error(`unexpected status "${status}"`)
}
statusArray.push(fullName)
}
}
}
Expand Down Expand Up @@ -137,14 +136,4 @@ function stripWorkingPath(path) {
return path.slice(WORKING_PATH.length)
}

function duplicateFileNames(path) {
if (path.includes('/src/')) {
const dist = path.replace('/src/', '/dist/').replace(/.tsx?$/, '.js')
if (fs.existsSync(`${__dirname}/../${dist}`)) {
return [path, dist]
}
}
return [path]
}

updatePassingTests()
104 changes: 0 additions & 104 deletions test/turbopack-tests-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,108 +1,4 @@
{
"packages/font/dist/google/find-font-files-in-css.test.js": {
"passed": [
"findFontFilesInCss should find all font files and preload requested subsets",
"findFontFilesInCss should not return duplicate font files when several variants use the same font file"
],
"failed": [],
"pending": [],
"runtimeError": false
},
"packages/font/dist/google/get-font-axes.test.js": {
"passed": [
"getFontAxes errors Invalid axes value",
"getFontAxes errors Invalid value in axes array",
"getFontAxes errors Setting axes on font without definable axes"
],
"failed": [],
"pending": [],
"runtimeError": false
},
"packages/font/dist/google/loader.test.js": {
"passed": [
"next/font/google loader URL from options Albert_Sans",
"next/font/google loader URL from options Ballet",
"next/font/google loader URL from options Fraunces",
"next/font/google loader URL from options Inter",
"next/font/google loader URL from options Molle",
"next/font/google loader URL from options Nabla",
"next/font/google loader URL from options Oooh_Baby",
"next/font/google loader URL from options Poppins",
"next/font/google loader URL from options Roboto",
"next/font/google loader URL from options Roboto Mono",
"next/font/google loader URL from options Roboto_Flex",
"next/font/google loader URL from options Source_Sans_3"
],
"failed": [],
"pending": [],
"runtimeError": false
},
"packages/font/dist/google/sort-fonts-variant-values.test.js": {
"passed": [
"sortFontsVariantValues should correctly compare and return result for comma-separated values",
"sortFontsVariantValues should correctly compare and return result for plain integer values",
"sortFontsVariantValues should sort an array of plain integer values correctly",
"sortFontsVariantValues should sort an array of values with comma-separated values correctly"
],
"failed": [],
"pending": [],
"runtimeError": false
},
"packages/font/dist/google/validate-google-font-function-call.test.js": {
"passed": [
"validateFontFunctionCall errors Invalid display value",
"validateFontFunctionCall errors Invalid subset in call",
"validateFontFunctionCall errors Missing function name",
"validateFontFunctionCall errors Missing subsets in config and call",
"validateFontFunctionCall errors Missing weight for non variable font",
"validateFontFunctionCall errors Setting axes on non variable font",
"validateFontFunctionCall errors Unknown font",
"validateFontFunctionCall errors Unknown style",
"validateFontFunctionCall errors Unknown weight",
"validateFontFunctionCall errors Variable in weight array"
],
"failed": [],
"pending": [],
"runtimeError": false
},
"packages/font/dist/local/loader.test.js": {
"passed": [
"next/font/local loader generated CSS Default CSS",
"next/font/local loader generated CSS Multiple styles default weight",
"next/font/local loader generated CSS Multiple weights default style",
"next/font/local loader generated CSS Other properties",
"next/font/local loader generated CSS Weight and style"
],
"failed": [],
"pending": [],
"runtimeError": false
},
"packages/font/dist/local/pick-font-file-for-fallback-generation.test.js": {
"passed": [
"pickFontFileForFallbackGeneration Invalid variable weight in array",
"pickFontFileForFallbackGeneration should error on invalid weight in array",
"pickFontFileForFallbackGeneration should pick the thinner weight if both have the same distance to 400",
"pickFontFileForFallbackGeneration should pick the weight closest to 400",
"pickFontFileForFallbackGeneration should pick variable range closest to 400",
"pickFontFileForFallbackGeneration should prefer normal style over italic"
],
"failed": [],
"pending": [],
"runtimeError": false
},
"packages/font/dist/local/validate-local-font-function-call.test.js": {
"passed": [
"validateLocalFontFunctionCall Empty src array",
"validateLocalFontFunctionCall Invalid declaration",
"validateLocalFontFunctionCall Invalid display value",
"validateLocalFontFunctionCall Invalid file extension",
"validateLocalFontFunctionCall Missing src",
"validateLocalFontFunctionCall Not using default export"
],
"failed": [],
"pending": [],
"runtimeError": false
},
"packages/font/src/google/find-font-files-in-css.test.ts": {
"passed": [
"findFontFilesInCss should find all font files and preload requested subsets",
Expand Down

0 comments on commit a908bd3

Please sign in to comment.