Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
course-discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
course-discovery
Commits
019cf969
Commit
019cf969
authored
Dec 15, 2015
by
Calen Pennington
Committed by
Clinton Blackburn
Dec 17, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use elasticsearch via docker, so that we can test against ES 1.5.2
parent
06a4c17d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
5 deletions
+22
-5
.travis.yml
+14
-3
course_discovery/settings/test.py
+6
-2
docker-compose.yml
+2
-0
No files found.
.travis.yml
View file @
019cf969
language
:
python
python
:
-
"
3.5"
services
:
-
docker
sudo
:
false
# Cache the pip directory. "cache: pip" doesn't work due to install override. See https://github.com/travis-ci/travis-ci/issues/3239.
cache
:
-
directories
:
-
$HOME/.cache/pip
before_install
:
-
"
export
DISPLAY=:99.0"
-
"
sh
-e
/etc/init.d/xvfb
start"
-
docker run --detach --publish 9200:9200 --publish 9300:9300 elasticsearch:1.5.2
install
:
-
pip install -U pip wheel codecov
-
pip install -r requirements/test.txt
before_script
:
# Give Elasticsearch time to start
-
sleep 10
script
:
-
make validate
branches
:
only
:
-
master
after_success
:
-
codecov
course_discovery/settings/test.py
View file @
019cf969
import
os
from
course_discovery.settings.base
import
*
# TEST SETTINGS
INSTALLED_APPS
+=
(
'django_nose'
,
...
...
@@ -31,3 +29,9 @@ DATABASES = {
},
}
# END IN-MEMORY TEST DATABASE
ELASTICSEARCH
=
{
'host'
:
os
.
environ
.
get
(
'TEST_ELASTICSEARCH_HOST'
,
'localhost'
),
'index'
:
'course_discovery_test'
,
'connect_on_startup'
:
True
}
docker-compose.yml
View file @
019cf969
...
...
@@ -34,6 +34,8 @@ course-discovery:
volumes
:
-
.:/edx/app/course_discovery/course_discovery
command
:
/edx/app/course_discovery/devstack.sh start
environment
:
TEST_ELASTICSEARCH_HOST
:
"
es"
ports
:
-
"
18381:18381"
-
"
8381:8381"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment