Merge branch 'master' into improve-cdp-message

Author: EmmaYuan1015

test/smoke/suites/activation.test.ts

@@ -42,15 +42,15 @@ export function startExtensionActivationTests(): void {
             try {
                 await ElementHelper.WaitElementSelectorVisible(
                     `[id="${Constant.previewExtensionId}"]`,
-                    2000,
+                    10000,
                 );
                 SmokeTestLogger.info("React-native preview extension is activated");
                 isActivited = true;
             } catch {
                 try {
                     await ElementHelper.WaitElementSelectorVisible(
                         `[id="${Constant.prodExtensionId}"]`,
-                        2000,
+                        10000,
                     );
                     SmokeTestLogger.info("React-native prod extension is activated");
                     isActivited = true;

test/smoke/suites/helper/application.ts

@@ -54,7 +54,7 @@ export class Application {
             timeout: 10000,
         });
 
-        await utilities.sleep(5000);
+        await utilities.sleep(10000);
         return this.mainPage;
     }
 
@@ -74,7 +74,13 @@ export class Application {
 
     async installExtensionFromVSIX(vscodeExecutablePath: string): Promise<void> {
         const [cliPath, ...args] = resolveCliArgsFromVSCodeExecutablePath(vscodeExecutablePath);
-        args.push(`--extensions-dir=${this.extensionDirectory}`);
+        // Remove existing --extensions-dir if present to avoid duplication
+        const extensionsDirIndex = args.findIndex(arg => arg.startsWith("--extensions-dir="));
+        if (extensionsDirIndex >= 0) {
+            args[extensionsDirIndex] = `--extensions-dir=${this.extensionDirectory}`;
+        } else {
+            args.push(`--extensions-dir=${this.extensionDirectory}`);
+        }
         let extensionFile = utilities.findFile(this.vsixDirectory, /.*\.(vsix)/);
         if (!extensionFile) {
             throw new Error(`React Native extension .vsix is not found in ${this.vsixDirectory}`);