[python] update test for spector

packages/http-client-python/eng/scripts/ci/regenerate.ts

@@ -191,7 +191,6 @@ async function getSubdirectories(baseDir: string, flags: RegenerateFlags): Promi
         const clientTspPath = join(subDirPath, "client.tsp");
 
         const mainTspRelativePath = toPosix(relative(baseDir, mainTspPath));
-        if (flags.flavor === "unbranded" && mainTspRelativePath.includes("azure")) return;
 
         // after fix test generation for nested operation group, remove this check
         if (mainTspRelativePath.includes("client-operation-group")) return;
@@ -295,7 +294,10 @@ async function regenerate(flags: RegenerateFlagsInput): Promise<void> {
     const flagsResolved = { debug: false, flavor: flags.flavor, ...flags };
     const subdirectoriesForAzure = await getSubdirectories(AZURE_HTTP_SPECS, flagsResolved);
     const subdirectoriesForNonAzure = await getSubdirectories(HTTP_SPECS, flagsResolved);
-    const subdirectories = [...subdirectoriesForAzure, ...subdirectoriesForNonAzure];
+    const subdirectories =
+      flags.flavor === "azure"
+        ? [...subdirectoriesForAzure, ...subdirectoriesForNonAzure]
+        : subdirectoriesForNonAzure;
     const cmdList: TspCommand[] = subdirectories.flatMap((subdirectory) =>
       _getCmdList(subdirectory, flagsResolved),
     );

packages/http-client-python/generator/test/generic_mock_api_tests/test_resiliency_srv_driven.py → packages/http-client-python/generator/test/azure/mock_api_tests/test_resiliency_srv_driven.py

@@ -90,8 +90,10 @@ def test_add_optional_param_from_one_optional():
         client.from_one_optional(parameter="optional", new_parameter="new")
 
 
-def test_break_the_glass(core_library):
-    request = core_library.rest.HttpRequest(method="DELETE", url="/add-operation")
+def test_break_the_glass():
+    from azure.core.rest import HttpRequest
+
+    request = HttpRequest(method="DELETE", url="/add-operation")
     with V1Client(
         endpoint="http://localhost:3000",
         service_deployment_version="v2",

packages/http-client-python/generator/test/generic_mock_api_tests/asynctests/test_resiliency_srv_driven_async.py → packages/http-client-python/generator/test/azure/mock_api_tests/test_resiliency_srv_driven_async.py

@@ -94,8 +94,9 @@ async def test_add_optional_param_from_one_optional():
 
 
 @pytest.mark.asyncio
-async def test_break_the_glass(core_library):
-    request = core_library.rest.HttpRequest(method="DELETE", url="/add-operation")
+async def test_break_the_glass():
+    from azure.core.rest import HttpRequest
+    request = HttpRequest(method="DELETE", url="/add-operation")
     async with V1Client(
         endpoint="http://localhost:3000",
         service_deployment_version="v2",

packages/http-client-python/generator/test/azure/requirements.txt

@@ -27,20 +27,24 @@ mypy==1.13.0
 -e ./generated/azure-resource-manager-common-properties
 -e ./generated/azure-resource-manager-resources
 -e ./generated/azure-payload-pageable
+-e ./generated/client-naming
+-e ./generated/client-structure-default
+-e ./generated/client-structure-multiclient
+-e ./generated/client-structure-renamedoperation
+-e ./generated/client-structure-twooperationgroup
+-e ./generated/resiliency-srv-driven1
+-e ./generated/resiliency-srv-driven2
 
 # common test case
 -e ./generated/authentication-api-key
 -e ./generated/authentication-http-custom
 -e ./generated/authentication-oauth2
 -e ./generated/authentication-union
--e ./generated/client-naming
 -e ./generated/encode-duration
 -e ./generated/encode-numeric
 -e ./generated/parameters-basic
 -e ./generated/parameters-collection-format
 -e ./generated/parameters-spread
--e ./generated/resiliency-srv-driven1
--e ./generated/resiliency-srv-driven2
 -e ./generated/serialization-encoded-name-json
 -e ./generated/server-endpoint-not-defined
 -e ./generated/server-path-multiple
@@ -73,10 +77,6 @@ mypy==1.13.0
 -e ./generated/special-headers-conditional-request
 -e ./generated/encode-datetime
 -e ./generated/encode-bytes
--e ./generated/client-structure-default
--e ./generated/client-structure-multiclient
--e ./generated/client-structure-renamedoperation
--e ./generated/client-structure-twooperationgroup
 -e ./generated/payload-content-negotiation
 -e ./generated/payload-json-merge-patch
 -e ./generated/payload-pageable

packages/http-client-python/generator/test/generic_mock_api_tests/conftest.py

@@ -17,8 +17,12 @@
 def start_server_process():
     azure_http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@azure-tools/azure-http-specs")
     http_path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@typespec/http-specs")
-    os.chdir(azure_http_path.resolve())
-    cmd = f"tsp-spector serve ./specs  {(http_path / 'specs').resolve()}"
+    if "unbranded" in Path(os.getcwd()).parts:
+        os.chdir(http_path.resolve())
+        cmd = "npx tsp-spector serve ./specs"
+    else:
+        os.chdir(azure_http_path.resolve())
+        cmd = f"npx tsp-spector serve ./specs {(http_path / 'specs').resolve()}"
     if os.name == "nt":
         return subprocess.Popen(cmd, shell=True)
     return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid)

packages/http-client-python/generator/test/unbranded/mock_api_tests/conftest.py

@@ -12,10 +12,9 @@
 
 
 def start_server_process():
-    azure_http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@azure-tools/azure-http-specs")
     http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@typespec/http-specs")
-    os.chdir(azure_http_path.resolve())
-    cmd = f"tsp-spector serve ./specs  {(http_path / 'specs').resolve()}"
+    os.chdir(http_path.resolve())
+    cmd = "tsp-spector serve ./specs"
     if os.name == "nt":
         return subprocess.Popen(cmd, shell=True)
     return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid)

packages/http-client-python/generator/test/unbranded/requirements.txt

@@ -15,14 +15,11 @@ mypy==1.13.0
 -e ./generated/authentication-http-custom
 -e ./generated/authentication-oauth2
 -e ./generated/authentication-union
--e ./generated/client-naming
 -e ./generated/encode-duration
 -e ./generated/encode-numeric
 -e ./generated/parameters-basic
 -e ./generated/parameters-collection-format
 -e ./generated/parameters-spread
--e ./generated/resiliency-srv-driven1
--e ./generated/resiliency-srv-driven2
 -e ./generated/serialization-encoded-name-json
 -e ./generated/server-endpoint-not-defined
 -e ./generated/server-path-multiple
@@ -55,10 +52,6 @@ mypy==1.13.0
 -e ./generated/special-headers-conditional-request
 -e ./generated/encode-datetime
 -e ./generated/encode-bytes
--e ./generated/client-structure-default
--e ./generated/client-structure-multiclient
--e ./generated/client-structure-renamedoperation
--e ./generated/client-structure-twooperationgroup
 -e ./generated/payload-content-negotiation
 -e ./generated/payload-json-merge-patch
 -e ./generated/payload-pageable