Merge pull request #779 from microsoft/psl-macaekn

fix: reverted unittest case changes

Author: Roopan-Microsoft

.github/workflows/test.yml

@@ -4,8 +4,9 @@ on:
   push:
     branches:
       - main
-      - demo-v4
-      - dev-v4
+      - dev
+      - demo
+      - hotfix
     paths:
       - 'src/backend/**/*.py'
       - 'src/tests/**/*.py'
@@ -23,8 +24,9 @@ on:
       - synchronize
     branches:
       - main
-      - demo-v4
-      - dev-v4
+      - dev
+      - demo
+      - hotfix
     paths:
       - 'src/backend/**/*.py'
       - 'src/tests/**/*.py'
@@ -64,23 +66,26 @@ jobs:
             echo "skip_tests=false" >> $GITHUB_ENV
           fi
 
-      - name: Run backend tests with coverage
+      - name: Run tests with coverage
         if: env.skip_tests == 'false'
         run: |
-          python -m pytest src/tests/backend/test_app.py --cov=backend.app --cov-report= --cov-config=.coveragerc -q > /dev/null 2>&1
-          python -m pytest src/tests/backend --cov=backend --cov-append --cov-report=xml --cov-report= --cov-config=.coveragerc --ignore=src/tests/backend/test_app.py 2>&1 | tee /tmp/pytest_output.txt
-          python -m coverage report --rcfile=.coveragerc
-          tail -1 /tmp/pytest_output.txt
-          
-          # Check coverage threshold
-          if [ -f coverage.xml ]; then
-            COVERAGE=$(python -c "import xml.etree.ElementTree as ET; tree = ET.parse('coverage.xml'); root = tree.getroot(); print(float(root.attrib['line-rate']) * 100)")
-            echo "Coverage: $COVERAGE%"
-            if (( $(echo "$COVERAGE < 80" | bc -l) )); then
-              echo "Coverage is below 80%, failing the job."
-              exit 1
-            fi
-          fi
+          pytest --cov=. --cov-report=term-missing --cov-report=xml \
+            --ignore=tests/e2e-test/tests \
+            --ignore=src/backend/tests/test_app.py \
+            --ignore=src/tests/agents/test_foundry_integration.py \
+            --ignore=src/tests/mcp_server/test_factory.py \
+            --ignore=src/tests/mcp_server/test_hr_service.py \
+            --ignore=src/backend/tests/test_config.py \
+            --ignore=src/tests/agents/test_human_approval_manager.py \
+            --ignore=src/backend/tests/test_team_specific_methods.py \
+            --ignore=src/backend/tests/models/test_messages.py \
+            --ignore=src/backend/tests/test_otlp_tracing.py \
+            --ignore=src/backend/tests/auth/test_auth_utils.py
+
+      # - name: Run tests with coverage
+      #   if: env.skip_tests == 'false'
+      #   run: |
+      #     pytest --cov=. --cov-report=term-missing --cov-report=xml --ignore=tests/e2e-test/tests
 
       - name: Skip coverage report if no tests
         if: env.skip_tests == 'true'

pytest.ini

@@ -1,7 +1,2 @@
 [pytest]
 addopts = -p pytest_asyncio
-pythonpath = src
-testpaths = src/tests
-python_files = test_*.py *_test.py
-python_functions = test_*
-python_classes = Test*

src/backend/app.py

@@ -5,21 +5,21 @@
 
 
 from azure.monitor.opentelemetry import configure_azure_monitor
-from backend.common.config.app_config import config
-from backend.common.models.messages_af import UserLanguage
+from common.config.app_config import config
+from common.models.messages_af import UserLanguage
 
 # FastAPI imports
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
 
 # Local imports
-from backend.middleware.health_check import HealthCheckMiddleware
-from backend.v4.api.router import app_v4
+from middleware.health_check import HealthCheckMiddleware
+from v4.api.router import app_v4
 
 # Azure monitoring
 
 
-from backend.v4.config.agent_registry import agent_registry
+from v4.config.agent_registry import agent_registry
 
 
 @asynccontextmanager

src/backend/v4/config/settings.py

@@ -17,7 +17,7 @@
 # from agent_framework_azure_ai import AzureOpenAIChatClient
 from agent_framework import ChatOptions
 
-from backend.v4.models.messages import MPlan, WebsocketMessageType
+from v4.models.messages import MPlan, WebsocketMessageType
 
 logger = logging.getLogger(__name__)
 

src/backend/v4/models/messages.py

@@ -8,7 +8,7 @@
 from pydantic import BaseModel
 
 from common.models.messages_af import AgentMessageType
-from backend.v4.models.models import MPlan, PlanStatus
+from v4.models.models import MPlan, PlanStatus
 
 
 # ---------------------------------------------------------------------------

src/backend/v4/orchestration/helper/plan_to_mplan_converter.py

@@ -2,7 +2,7 @@
 import re
 from typing import Iterable, List, Optional
 
-from backend.v4.models.models import MPlan, MStep
+from v4.models.models import MPlan, MStep
 
 logger = logging.getLogger(__name__)