Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Run functional tests for REST API during a build #506

Merged
merged 8 commits into from
Jul 15, 2019
Merged

Run functional tests for REST API during a build #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d508201
Run tests for REST API
EvgenyShashkin Jun 20, 2019
2720c0b
Added DJANGO_CONFIGURATION with value "testing"
EvgenyShashkin Jun 20, 2019
02b7c86
Fixed crash of python tests
EvgenyShashkin Jun 20, 2019
6898add
Update .travis.yml
EvgenyShashkin Jun 20, 2019
f996023
Update CHANGELOG.md
EvgenyShashkin Jun 26, 2019
2d805ae
Merge branch 'develop' into develop
nmanovic Jun 27, 2019
27caedb
Merge branch 'develop' into develop
nmanovic Jun 28, 2019
0fbd58a
Removed --settings option
nmanovic Jul 15, 2019
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
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions docker-compose.ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ services:
cvat:
build:
args:
DJANGO_CONFIGURATION: "testing"
WITH_TESTS: "yes"
network: host
environment:
Expand Down