Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ jobs:
uv run pytest tests/test_performance_execute.py -v --tb=short -m performance
continue-on-error: true

- name: Run unit test suite (no coverage)
- name: Skip separate unit tests (now included in integration tests)
run: |
uv run pytest tests/ -v --tb=short --ignore=tests/test_integration_execute.py

echo "ℹ️ Unit tests are now included in the comprehensive integration test suite"
echo "ℹ️ This provides better coverage by combining unit + integration testing"

lint:
name: Code Quality
Expand Down Expand Up @@ -270,14 +270,14 @@ jobs:
sudo chmod +x /usr/local/bin/docker-compose
docker-compose --version

- name: Run Simplified CI Integration Tests
- name: Run Comprehensive Test Suite (Unit + Integration)
run: |
chmod +x scripts/test-ci-simple.sh
./scripts/test-ci-simple.sh

- name: Extract coverage files from CI containers
- name: Extract coverage files from comprehensive test suite
run: |
echo "🔍 Extracting coverage files from CI test..."
echo "🔍 Extracting coverage files from comprehensive test suite (unit + integration)..."

# Get CI container ID
ci_container_id=$(docker-compose -f docker-compose.ci.yml ps -q ci-app 2>/dev/null | head -1)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# JMeter Toolkit v2.0

![CI/CD](https://github.com/lihuacai168/jmeter_toolit/actions/workflows/ci.yml/badge.svg)
![CI/CD](https://github.com/lihuacai168/Jmeter-Toolkit/actions/workflows/ci.yml/badge.svg)
![Python](https://img.shields.io/badge/python-3.9%2B-blue.svg)
![FastAPI](https://img.shields.io/badge/FastAPI-0.104%2B-green.svg)
[![codecov](https://codecov.io/gh/lihuacai168/jmeter_toolit/branch/master/graph/badge.svg)](https://codecov.io/gh/lihuacai168/jmeter_toolit)
[![codecov](https://codecov.io/gh/lihuacai168/Jmeter-Toolkit/branch/master/graph/badge.svg)](https://codecov.io/gh/lihuacai168/jmeter_toolit)
![License](https://img.shields.io/badge/license-MIT-blue.svg)

JMeter Toolkit 是一个专门为 JMeter 测试管理而设计的强大工具集。
Expand Down
18 changes: 15 additions & 3 deletions scripts/test-ci-simple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,20 @@ else
fi
fi

# Run core API tests with coverage
echo "🧪 Running core API tests with coverage..."
docker-compose -f $COMPOSE_FILE exec -T ci-app python -m pytest tests/test_execute_api.py -v --cov=. --cov-report=xml --cov-report=term-missing --tb=short
# Run comprehensive test suite with coverage (unit tests + integration tests)
echo "🧪 Running comprehensive test suite with coverage..."
echo " 📋 Test coverage includes:"
echo " • Unit tests: ~47 test functions"
echo " • Integration tests: test_execute_api.py (19 tests)"
echo " • Total coverage from all test files except test_integration_execute.py"

# Run all tests except the full integration tests (which require more complex setup)
docker-compose -f $COMPOSE_FILE exec -T ci-app python -m pytest tests/ -v \
--cov=. \
--cov-report=xml \
--cov-report=term-missing \
--tb=short \
--ignore=tests/test_integration_execute.py \
--ignore=tests/test_performance_execute.py

echo "✅ Simplified CI integration tests completed successfully!"
Loading