Skip to content

Commit

Permalink
Resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
tanaysoni committed Jan 13, 2021
1 parent f910262 commit 3d811d2
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,14 @@ def get_document_store(document_store_type, embedding_field="embedding"):
client = Elasticsearch()
client.indices.delete(index='haystack_test*', ignore=[404])
document_store = ElasticsearchDocumentStore(
index="haystack_test", return_embedding=True, embedding_field=embedding_field
index="haystack_test", return_embedding=True, embedding_field=embedding_field, index_buffer_size=3
)
elif document_store_type == "faiss":
document_store = FAISSDocumentStore(
sql_url="sqlite://", return_embedding=True, embedding_field=embedding_field
sql_url="sqlite://",
return_embedding=True,
embedding_field=embedding_field,
index_buffer_size=3,
)
return document_store
else:
Expand Down

0 comments on commit 3d811d2

Please sign in to comment.