feat: use endpoint value from workflow dispatch

janhq · May 20, 2024 · 4502757 · 4502757
1 parent 8d4a8a7
commit 4502757
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/jan-openai-api-test.yml b/.github/workflows/jan-openai-api-test.yml
@@ -5,7 5,7 @@ on:
  endpoints:
  description: 'comma-separated list (see available at endpoints_mapping.json e.g. GET /users,POST /transform)'
  required: false
- default: none
  default: All
  type: string
 
  push:
@@ -75,14 75,8 @@ jobs:
  cat ../docs/tests/endpoints_mapping.json >> tests/endpoints_mapping.json
  
  # start mock server and run test then stop mock server
- IFS=',' read -ra endpoints <<< "$ENDPOINTS"
- markers=""
- for endpoint in "${endpoints[@]}"; do
- markers ="endpoint($endpoint) or "
- done
- markers=${markers% or }
  prism mock ../docs/openapi/jan.yaml > prism.log & prism_pid=$! &&
- pytest -k "$markers" --reportportal --html=report.html && kill $prism_pid
  pytest --endpoint "$ENDPOINTS" --reportportal --html=report.html && kill $prism_pid
  deactivate
  env:
  ENDPOINTS: ${{ github.event.inputs.endpoints }}

diff --git a/docs/tests/conftest.py b/docs/tests/conftest.py
@@ -1,18 1,26 @@
 import json
 
 
 def pytest_addoption(parser):
- parser.addoption("--endpoint", action="store", default="all", help="my option: endpoints")
  parser.addoption(
  "--endpoint", action="store", default="all", help="my option: endpoints"
  )
 
 
 def pytest_configure(config):
- config.addinivalue_line("markers", "endpoint(endpoint): this mark select the test based on endpoint")
  config.addinivalue_line(
  "markers", "endpoint(endpoint): this mark select the test based on endpoint"
  )
 
 
 def pytest_runtest_setup(item):
- getoption = item.config.getoption("--endpoint").split(',')
  getoption = item.config.getoption("--endpoint").split(",")
  if getoption != ["all"]:
  endpoint_names = [mark.args[0] for mark in item.iter_markers(name="endpoint")]
  if not endpoint_names or not set(getoption).intersection(set(endpoint_names)):
  pytest.skip("Test skipped because endpoint is {!r}".format(endpoint_names))
 
 
 def pytest_collection_modifyitems(items):
  # load the JSON file
  with open("tests/endpoints_mapping.json", "r") as json_file: