Skip to content

Commit 275003e

Browse files
committed
k
1 parent 0569804 commit 275003e

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

.github/workflows/test.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,23 @@ jobs:
107107
OPTILLM_API_KEY=optillm python tests/test_n_parameter.py
108108
OPTILLM_API_KEY=optillm python -m pytest tests/test_api_compatibility.py -v --tb=short || echo "API compatibility tests require pytest"
109109
OPTILLM_API_KEY=optillm python tests/test.py --approaches none --single-test "Simple Math Problem" || echo "Main test completed"
110+
111+
# Run SSL config tests (no server needed but requires proper env setup)
112+
echo "Running SSL config tests..."
113+
python -m pytest tests/test_ssl_config.py -v --tb=short
114+
115+
# Run MARS tests
116+
echo "Running MARS parallel tests..."
117+
OPTILLM_API_KEY=optillm python -m pytest tests/test_mars_parallel.py -v --tb=short
118+
119+
# Run deepconf tests
120+
echo "Running deepconf tests..."
121+
OPTILLM_API_KEY=optillm python -m pytest tests/test_deepconf.py -v --tb=short
122+
123+
# Run conversation logger unit tests (no server needed)
124+
echo "Running conversation logger tests..."
125+
python -m pytest tests/test_conversation_logger.py -v --tb=short
126+
110127
echo "All integration tests completed successfully!"
111128
exit 0
112129
env:

tests/test_conversation_logging_server.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ def tearDownClass(cls):
6868
def _check_existing_server():
6969
"""Check if OptILLM server is already running"""
7070
try:
71-
response = requests.get("http://localhost:8000/v1/health", timeout=2)
71+
response = requests.get("http://localhost:8000/health", timeout=2)
7272
return response.status_code == 200
7373
except requests.exceptions.RequestException:
7474
return False
75-
75+
7676
@staticmethod
7777
def _check_server_health():
7878
"""Check if server is healthy"""
7979
try:
80-
response = requests.get("http://localhost:8000/v1/health", timeout=5)
80+
response = requests.get("http://localhost:8000/health", timeout=5)
8181
return response.status_code == 200
8282
except requests.exceptions.RequestException:
8383
return False
@@ -515,7 +515,10 @@ class TestConversationLoggingPerformanceWithServer(unittest.TestCase):
515515

516516
def setUp(self):
517517
"""Check server availability"""
518-
if not requests.get("http://localhost:8000/v1/health", timeout=2).status_code == 200:
518+
try:
519+
if requests.get("http://localhost:8000/health", timeout=2).status_code != 200:
520+
self.skipTest("OptILLM server not available")
521+
except requests.exceptions.RequestException:
519522
self.skipTest("OptILLM server not available")
520523

521524
self.client = OpenAI(api_key="optillm", base_url="http://localhost:8000/v1")

0 commit comments

Comments
 (0)