Skip to content

Commit 035c312

Browse files
committed
fixing up tests
1 parent 6c430e5 commit 035c312

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

readthedocs/search/tests/conftest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ def mock_elastic_index(mocker):
1919

2020
@pytest.fixture()
2121
def es_index():
22+
call_command('search_index', '--delete', '-f')
2223
call_command('search_index', '--create')
2324

2425
yield
25-
call_command('search_index', '--delete')
26+
call_command('search_index', '--delete', '-f')
2627

2728

2829
@pytest.fixture

readthedocs/search/tests/test_views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def test_search_project_filter_language(self, client, project):
7777

7878
@pytest.mark.django_db
7979
@pytest.mark.search
80-
@pytest.mark.xfail("File search not work still!")
80+
@pytest.mark.xfail(reason="File search not work still!")
8181
class TestElasticSearch(object):
8282
url = reverse('search')
8383

scripts/travis/install_elasticsearch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ then
33
wget ${ES_DOWNLOAD_URL}
44
tar -xzf elasticsearch-${ES_VERSION}.tar.gz
55
./elasticsearch-${ES_VERSION}/bin/elasticsearch-plugin install analysis-icu
6-
./elasticsearch-${ES_VERSION}/bin/elasticsearch &
6+
./elasticsearch-${ES_VERSION}/bin/elasticsearch -d
77
fi

0 commit comments

Comments
 (0)