From 8daf7158af1f148beaab5ddd3f7d48c236057764 Mon Sep 17 00:00:00 2001 From: EvgenyShashkin <44070548+EvgenyShashkin@users.noreply.github.com> Date: Mon, 15 Jul 2019 14:21:46 +0300 Subject: [PATCH] Run functional tests for REST API during a build (#506) * Run tests for REST API * Added DJANGO_CONFIGURATION with value "testing" * Fixed crash of python tests * Update .travis.yml * Update CHANGELOG.md * Removed --settings option --- .travis.yml | 3 +-- CHANGELOG.md | 1 + docker-compose.ci.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 722d2e0a..2579ffc0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,5 +12,4 @@ before_script: - docker-compose -f docker-compose.yml -f docker-compose.ci.yml up --build -d script: - - docker exec -it cvat /bin/bash -c 'tests/node_modules/.bin/karma start tests/karma.conf.js' - + - docker exec -it cvat /bin/bash -c 'python3 manage.py test cvat/apps/engine && tests/node_modules/.bin/karma start tests/karma.conf.js' diff --git a/CHANGELOG.md b/CHANGELOG.md index 54089c82..f0a81eff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Installation guide - Linear interpolation for a single point - Video frame filter +- Running functional tests for REST API during a build - Admins are no longer limited to a subset of python commands in the auto annotation application - Remote data source (list of URLs to create an annotation task) - Auto annotation using Faster R-CNN with Inception v2 (utils/open_model_zoo) diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index b0bcb0f3..5fb00380 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -4,6 +4,7 @@ services: cvat: build: args: + DJANGO_CONFIGURATION: "testing" WITH_TESTS: "yes" network: host environment: