Skip to content

Commit 4266ab9

Browse files
royrussoroyrusso
committed
- Adding tests for version 2 and version 5. - Moved all tests to use docker containers - Added HTMLCov and Pytest HTML output
1 parent 8fee322 commit 4266ab9

25 files changed

+341
-731
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ pip-delete-this-directory.txt
5454

5555
# Unit test / coverage reports
5656
htmlcov/
57+
htmlout/
5758
.tox/
5859
.coverage
5960
.coverage.*

‎elastichq/config/settings.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class TestSettings(BaseSettings):
3535
BASEPATH = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
3636

3737
# user configurable
38-
_sqlalchemy_database_uri = 'sqlite:///' + os.path.join(BASEPATH, 'test_elastichq.db')
38+
_sqlalchemy_database_uri = 'sqlite:///:memory' #'sqlite:///' + os.path.join(BASEPATH, 'test_elastichq.db')
3939
_scheduler_api_enabled = False
4040
_sqlalchemy_track_modifications = False
4141

@@ -63,28 +63,9 @@ class TestSettings(BaseSettings):
6363
HQ_SITE_URL = 'http://elastichq.org'
6464
HQ_GH_URL = 'https://github.com/ElasticHQ/elasticsearch-HQ'
6565
API_VERSION = 'v3.5.1'
66-
ES_V2_HOST = '127.0.0.1'
67-
ES_V2_PORT = '9200'
68-
ES_V5_HOST = '127.0.0.1'
69-
ES_V5_PORT = '8200'
70-
ES_V6_HOST = '127.0.0.1'
71-
ES_V6_PORT = '7200'
72-
ES_V6_USERNAME = 'elastic'
73-
ES_V6_PASSWORD = 'new_password'
7466

7567
ES_TEST_INDEX_NAME = 'cars'
7668

77-
# Cluster URL is used in the text fixture, for easy connections using lib requests.
78-
ES_V2_CLUSTER_URL = 'http://%s:%s' % (ES_V2_HOST, ES_V2_PORT)
79-
ES_V5_CLUSTER_URL = 'http://%s:%s' % (ES_V5_HOST, ES_V5_PORT)
80-
ES_V6_CLUSTER_URL = 'http://%s:%s@%s:%s' % (ES_V6_USERNAME, ES_V6_PASSWORD, ES_V6_HOST, ES_V6_PORT)
81-
82-
# Cluster connect strings are passed to /_connect endpoint to initiate pools
83-
ES_V2_CLUSTER_CONNECT = '{"ip": "%s", "port": "%s"}' % (ES_V2_HOST, ES_V2_PORT)
84-
ES_V5_CLUSTER_CONNECT = '{"ip": "%s", "port": "%s"}' % (ES_V5_HOST, ES_V5_PORT)
85-
ES_V6_CLUSTER_CONNECT = '{"ip": "%s", "port": "%s", "username" : "%s", "password" : "%s"}' % (
86-
ES_V6_HOST, ES_V6_PORT, ES_V6_USERNAME, ES_V6_PASSWORD)
87-
8869
# Key matching: For tests, we enforce that all responses, regardless of ES version contain the same keys.
8970
KEYS_CLUSTER_HEALTH = ['active_primary_shards', 'number_of_in_flight_fetch', 'number_of_data_nodes',
9071
'number_of_nodes', 'delayed_unassigned_shards', 'unassigned_shards',

‎manage.py

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,10 @@ def run(self):
112112
'--docker-compose-remove-volumes',
113113
'-m=hq_ops',
114114
'-s', # verbose logging
115-
'--maxfail=5',
116-
'--cov=tests',
115+
'--cov=' + tests_path,
116+
'--cov-report=html:' + tests_path + '/htmlcov',
117+
'--html=' + tests_path + '/htmlout/hq_ops.html',
118+
'--self-contained-html'
117119
])
118120

119121
pytest.main(
@@ -126,8 +128,24 @@ def run(self):
126128
'--docker-compose-remove-volumes',
127129
'-m=es_versions',
128130
'-s', # verbose logging
129-
'--maxfail=5',
130-
'--cov=tests'
131+
'--cov=' + tests_path,
132+
'--html=' + tests_path + '/htmlout/es_2.html',
133+
'--self-contained-html'
134+
])
135+
136+
pytest.main(
137+
[
138+
tests_path,
139+
'--verbose',
140+
'--color=yes',
141+
'-c=' + tests_path + '/pytest.ini',
142+
'--docker-compose=' + tests_path + '/v5_docker-compose.yml',
143+
'--docker-compose-remove-volumes',
144+
'-m=es_versions',
145+
'-s', # verbose logging
146+
'--cov=' + tests_path,
147+
'--html=' + tests_path + '/htmlout/es_5.html',
148+
'--self-contained-html'
131149
])
132150

133151
return None

‎requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ pytest==5.0.1
3131
pytest-cov==2.7.1
3232
pytest-ordering==0.6
3333
pytest-docker-compose==3.0.0
34+
pytest-html==1.22.0
3435

3536
# Scheduler
3637
apscheduler==3.5.0

‎tests/combined/test_connections.py

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import logging
44

55
import pytest
6-
import requests
7-
from requests.adapters import HTTPAdapter
8-
from urllib3.util.retry import Retry
96

107
pytest_plugins = ["docker_compose"]
118
LOGGER = logging.getLogger(__name__)
@@ -23,23 +20,7 @@ def test_get_clusters(session_scoped_container_getter, fixture):
2320

2421

2522
@pytest.mark.hq_ops
26-
@pytest.fixture(scope="function")
27-
def wait_for_api(session_scoped_container_getter):
28-
"""Wait for the api from elasticsearch to become responsive"""
29-
request_session = requests.Session()
30-
retries = Retry(total=20,
31-
backoff_factor=0.1,
32-
status_forcelist=[500, 502, 503, 504])
33-
request_session.mount('http://', HTTPAdapter(max_retries=retries))
34-
35-
service = session_scoped_container_getter.get("elasticsearch").network_info[0]
36-
api_url = "http://%s:%s/" % (service.hostname, service.host_port)
37-
assert request_session.get(api_url)
38-
return request_session, api_url
39-
40-
41-
@pytest.mark.hq_ops
42-
def test_connect_to_clusters(wait_for_api, session_scoped_container_getter, fixture):
23+
def test_connect_to_clusters(session_scoped_container_getter, fixture):
4324
fixture.clear_all_clusters()
4425

4526
container = session_scoped_container_getter.get('elasticsearch').network_info[0]
@@ -59,7 +40,7 @@ def test_connect_to_clusters(wait_for_api, session_scoped_container_getter, fixt
5940

6041
@pytest.mark.hq_ops
6142
def test_delete_connection(session_scoped_container_getter, fixture):
62-
fixture.add_all_clusters(clear_first=True)
43+
fixture.add_all_clusters(session_scoped_container_getter, clear_first=True)
6344

6445
response = fixture.app.get('/api/clusters')
6546

‎tests/combined/test_indices.py

Lines changed: 0 additions & 96 deletions
This file was deleted.

‎tests/combined/test_nodes.py

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
11
__author__ = 'royrusso'
22

3-
4-
class TestNodes:
5-
def test_get_nodes_summary(self, fixture):
6-
"""
7-
Tests nodes summary endpoint. All ES versions should return the same keys.
8-
9-
:param fixture:
10-
:return:
11-
"""
12-
fixture.add_all_clusters()
13-
14-
response = fixture.app.get('/api/nodes/%s/_summary' % fixture.cluster_v2_name)
15-
16-
assert 200 == response.status_code
17-
res = fixture.get_response_data(response)
18-
node = res.get('data')[0]
19-
assert node['host'] == '127.0.0.1'
20-
assert node['is_data_node'] == True
21-
assert node['is_master_node'] == True
22-
# assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_FS, node['fs'].keys()) is True
23-
# assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_JVM, node['jvm'].keys()) is True
24-
25-
response = fixture.app.get('/api/nodes/%s/_summary' % fixture.cluster_v5_name)
26-
27-
assert 200 == response.status_code
28-
res = fixture.get_response_data(response)
29-
node = res.get('data')[0]
30-
assert node['host'] == '127.0.0.1'
31-
assert node['is_data_node'] == True
32-
assert node['is_master_node'] == True
33-
# assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_FS, node['fs'].keys()) is True
34-
# assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_JVM, node['jvm'].keys()) is True
35-
36-
response = fixture.app.get('/api/nodes/%s/_summary' % fixture.cluster_v6_name)
37-
38-
assert 200 == response.status_code
39-
res = fixture.get_response_data(response)
40-
node = res.get('data')[0]
41-
assert node['host'] == '127.0.0.1'
42-
assert node['is_data_node'] == True
43-
assert node['is_master_node'] == True
44-
# assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_FS, node['fs'].keys()) is True
45-
# assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_JVM, node['jvm'].keys()) is True
46-
3+
#
4+
# class TestNodes:
5+
# def test_get_nodes_summary(self, fixture):
6+
# """
7+
# Tests nodes summary endpoint. All ES versions should return the same keys.
8+
#
9+
# :param fixture:
10+
# :return:
11+
# """
12+
# fixture.add_all_clusters()
13+
#
14+
# response = fixture.app.get('/api/nodes/%s/_summary' % fixture.cluster_name)
15+
#
16+
# assert 200 == response.status_code
17+
# res = fixture.get_response_data(response)
18+
# node = res.get('data')[0]
19+
# assert node['host'] == '127.0.0.1'
20+
# assert node['is_data_node'] == True
21+
# assert node['is_master_node'] == True
22+
# # assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_FS, node['fs'].keys()) is True
23+
# # assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_JVM, node['jvm'].keys()) is True
24+
#
25+
# response = fixture.app.get('/api/nodes/%s/_summary' % fixture.cluster_v5_name)
26+
#
27+
# assert 200 == response.status_code
28+
# res = fixture.get_response_data(response)
29+
# node = res.get('data')[0]
30+
# assert node['host'] == '127.0.0.1'
31+
# assert node['is_data_node'] == True
32+
# assert node['is_master_node'] == True
33+
# # assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_FS, node['fs'].keys()) is True
34+
# # assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_JVM, node['jvm'].keys()) is True
35+
#
36+
# response = fixture.app.get('/api/nodes/%s/_summary' % fixture.cluster_v6_name)
37+
#
38+
# assert 200 == response.status_code
39+
# res = fixture.get_response_data(response)
40+
# node = res.get('data')[0]
41+
# assert node['host'] == '127.0.0.1'
42+
# assert node['is_data_node'] == True
43+
# assert node['is_master_node'] == True
44+
# # assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_FS, node['fs'].keys()) is True
45+
# # assert fixture.has_all_keys(fixture.config.KEYS_NODE_SUMMARY_JVM, node['jvm'].keys()) is True
46+
#

0 commit comments

Comments
 (0)