ensure we never stomp on each other

Author: scbedd

test/debug_failing_example.ts

@@ -5,19 +5,19 @@
 
 import * as validate from "../lib/validate";
 
-import { repoPath, clonePR } from "./utilities.helpers";
+import { clonePR } from "./utilities.helpers";
 
 const prNumber: number = 0;
 const prRepo: string = "azure/azure-rest-api-specs";
-const specPath = `${repoPath}/specification/storage/resource-manager/Microsoft.Storage/stable/2023-01-01/blob.json`;
+const specRelPath = `specification/storage/resource-manager/Microsoft.Storage/stable/2023-01-01/blob.json`;
 
 jest.setTimeout(1000000); // Set the timeout in milliseconds
 
 describe("Model Validation", () => {
   it("Debug an individual spec failing model validation.", async () => {
-    clonePR(`https://github.com/${prRepo}.git`, prNumber);
+    const repoPath = clonePR(`https://github.com/${prRepo}.git`, prNumber);
 
-    const result = await validate.validateExamples(specPath, undefined);
+    const result = await validate.validateExamples(`${repoPath}/${specRelPath}`, undefined);
     console.log(result);
   });
 });

test/debug_failing_spec.ts

@@ -5,19 +5,18 @@
 
 import * as validate from "../lib/validate";
 
-import { repoPath, clonePR } from "./utilities.helpers";
+import { clonePR } from "./utilities.helpers";
 
 const prNumber: number = 27067;
 const prRepo: string = "azure/azure-rest-api-specs";
-const specPath = `${repoPath}/specification/storage/resource-manager/Microsoft.Storage/stable/2023-01-01/blob.json`;
+const specRelPath = `specification/storage/resource-manager/Microsoft.Storage/stable/2023-01-01/blob.json`;
 
 jest.setTimeout(1000000); // Set the timeout in milliseconds
 
 describe("Semantic Validation", () => {
   it("Debug an individual spec failing semantic validation.", async () => {
-    clonePR(`https://github.com/${prRepo}.git`, prNumber);
-
-    const result = await validate.validateSpec(specPath, undefined);
+    const repoPath = clonePR(`https://github.com/${prRepo}.git`, prNumber);
+    const result = await validate.validateSpec(`${repoPath}/${specRelPath}`, undefined);
     console.log(result);
   });
 });

test/utilities.helpers.ts

@@ -10,9 +10,10 @@ const testPath = __dirname.replace("\\", "/");
 export const repoPath: string = path.join(testPath, "..", ".autopull");
 
 // Function to clone a specific PR's code from the Git repo
-export function clonePR(url: string, prNumber: number): void {
+export function clonePR(url: string, prNumber: number): string {
   const prBranch = `pull/${prNumber}/head`;
-  const execOptions = { cwd: repoPath };
+  const finalRepoPath = path.join(repoPath, prNumber.toString());
+  const execOptions = { cwd: finalRepoPath };
   const outputFile: string = path.join(execOptions.cwd, "stamp.txt");
   const existingData = getPRData(outputFile);
 
@@ -21,10 +22,10 @@ export function clonePR(url: string, prNumber: number): void {
       `Previously downloaded spec repo does not match targeted prNumber ${prNumber} or repo ${url}`
     );
 
-    if (fs.existsSync(repoPath)) {
-      fs.removeSync(repoPath);
+    if (fs.existsSync(finalRepoPath)) {
+      fs.removeSync(finalRepoPath);
     }
-    fs.mkdirSync(repoPath);
+    fs.mkdirSync(finalRepoPath);
 
     try {
       if (prNumber !== 0) {
@@ -44,6 +45,8 @@ export function clonePR(url: string, prNumber: number): void {
       `Previously downloaded spec repo matches the expected PR Number ${prNumber} and repo ${url}. Skipping re-clone.`
     );
   }
+
+  return finalRepoPath;
 }
 
 function writePRData(targetFile: string, data: PRData): void {