update conftest for spector

.chronus/changes/spector-migration-dashboard-fix-2025-0-3-3-5-5.md

@@ -0,0 +1,7 @@
+---
+changeKind: internal
+packages:
+  - "@azure-tools/typespec-python"
+---
+
+Update test for unbranded and azure

eng/pipelines/internal-ci.yml

@@ -34,7 +34,7 @@ steps:
         scriptType: "bash"
         scriptLocation: "inlineScript"
         inlineScript: npx tsp-spector upload-coverage --coverageFile ./spec-coverage.json --generatorName "@typespec/http-client-python" --storageAccountName typespec --generatorVersion $(node -p -e "require('$(Build.SourcesDirectory)/autorest.python/packages/typespec-python/node_modules/@typespec/http-client-python/package.json').version") --containerName coverages --generatorMode standard
-        workingDirectory: $(Build.SourcesDirectory)/autorest.python/packages/typespec-python/node_modules/@azure-tools/azure-http-specs
+        workingDirectory: $(Build.SourcesDirectory)/autorest.python/packages/typespec-python/node_modules/@typespec/http-specs
 
     - script: |
             tox run -e ci

packages/typespec-python/scripts/eng/regenerate.ts

@@ -169,7 +169,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;
@@ -264,7 +263,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/typespec-python/test/generic_mock_api_tests/asynctests/test_resiliency_srv_driven_async.py → packages/typespec-python/test/azure/mock_api_tests/asynctests/test_resiliency_srv_driven_async.py

@@ -94,8 +94,10 @@ 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/typespec-python/test/generic_mock_api_tests/test_resiliency_srv_driven.py → packages/typespec-python/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/typespec-python/test/azure/requirements.txt

@@ -20,20 +20,24 @@ azure-mgmt-core==1.3.2
 -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
@@ -66,10 +70,6 @@ azure-mgmt-core==1.3.2
 -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/typespec-python/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"npx 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)