x
/
surveil
Code Issues Proposed changes

Merge "Remove httpretty"

This commit is contained in:
Jenkins 2015-05-29 14:03:08 +00:00 committed by Gerrit Code Review
parent 08c51ead3c 10abd67e20
commit 6d829fa579
10 changed files with 251 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
surveil/api/app.py
View File

@ -12,6 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from __future__ import unicode_literals
import os
from paste import deploy

93
surveil/tests/api/controllers/v1/test_hosts.py
View File

@ -15,7 +15,8 @@
import copy
import json
import httpretty
import requests_mock
from six.moves import urllib_parse
from surveil.api.controllers.v1.datamodel import host
from surveil.tests.api import functionalTest
@ -174,55 +175,55 @@ class TestHostController(functionalTest.FunctionalTest):
json.loads(response.body.decode())
)
@httpretty.activate
def test_submit_service_result(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/push_check_result")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/push_check_result")
check_result = {
"return_code": "0",
"output": "TEST OUTPUT",
"time_stamp": "1409149234"
}
response = self.app.post_json(
"/v1/hosts/bogus-router/services/service-example/results",
params=check_result
)
self.assertEqual(response.status_int, 204)
self.assertEqual(
httpretty.last_request().parsed_body,
{
u'output': [u'TEST OUTPUT'],
u'return_code': [u'0'],
u'service_description': [u'service-example'],
u'host_name': [u'bogus-router'],
u'time_stamp': [u'1409149234']
check_result = {
"return_code": "0",
"output": "TEST OUTPUT",
"time_stamp": "1409149234"
}
)
@httpretty.activate
response = self.app.post_json(
"/v1/hosts/bogus-router/services/service-example/results",
params=check_result
)
self.assertEqual(response.status_int, 204)
self.assertEqual(
urllib_parse.parse_qs(m.last_request.body),
{
u'output': [u'TEST OUTPUT'],
u'return_code': [u'0'],
u'service_description': [u'service-example'],
u'host_name': [u'bogus-router'],
u'time_stamp': [u'1409149234']
}
)
def test_submit_host_result(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/push_check_result")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/push_check_result")
check_result = {
"return_code": "0",
"output": "TEST OUTPUT",
"time_stamp": "1409149234"
}
response = self.app.post_json("/v1/hosts/bogus-router/results",
params=check_result)
self.assertEqual(response.status_int, 204)
self.assertEqual(
httpretty.last_request().parsed_body,
{
u'output': [u'TEST OUTPUT'],
u'return_code': [u'0'],
u'host_name': [u'bogus-router'],
u'time_stamp': [u'1409149234']
check_result = {
"return_code": "0",
"output": "TEST OUTPUT",
"time_stamp": "1409149234"
}
)
response = self.app.post_json("/v1/hosts/bogus-router/results",
params=check_result)
self.assertEqual(response.status_int, 204)
self.assertEqual(
urllib_parse.parse_qs(m.last_request.body),
{
u'output': [u'TEST OUTPUT'],
u'return_code': [u'0'],
u'host_name': [u'bogus-router'],
u'time_stamp': [u'1409149234']
}
)

22
surveil/tests/api/controllers/v1/test_reload_config.py
View File

@ -12,21 +12,21 @@
# License for the specific language governing permissions and limitations
# under the License.
import httpretty
from surveil.tests.api import functionalTest
import requests_mock
class TestReloadConfigController(functionalTest.FunctionalTest):
@httpretty.activate
def test_reload_config(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/reload")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/reload")
response = self.app.post("/v1/reload_config")
self.assertEqual(response.status_int, 200)
self.assertEqual(
httpretty.last_request().path,
'/reload'
)
response = self.app.post("/v1/reload_config")
self.assertEqual(response.status_int, 200)
self.assertEqual(
m.last_request.path,
'/reload'
)

55
surveil/tests/api/controllers/v2/actions/test_acknowledge.py
View File

@ -12,48 +12,47 @@
# License for the specific language governing permissions and limitations
# under the License.
import httpretty
import requests_mock
from surveil.tests.api import functionalTest
class TestAcknowledgeController(functionalTest.FunctionalTest):
@httpretty.activate
def test_acknowledge_add(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/acknowledge")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/acknowledge")
ack = {
"host_name": "localhost"
}
ack = {
"host_name": "localhost"
}
response = self.post_json("/v2/actions/acknowledge/", params=ack)
response = self.post_json("/v2/actions/acknowledge/", params=ack)
self.assertEqual(response.status_int, 200)
self.assertEqual(response.status_int, 200)
self.assert_count_equal_backport(httpretty.last_request().body.decode()
.split('&'),
['host_name=localhost', 'action=add'])
self.assertEqual(httpretty.last_request().path,
'/acknowledge')
self.assert_count_equal_backport(m.last_request.body.split('&'),
['host_name=localhost',
'action=add'])
self.assertEqual(m.last_request.path,
'/acknowledge')
@httpretty.activate
def test_acknowledge_delete(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/downtime")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/downtime")
ack = {
"host_name": "localhost",
}
ack = {
"host_name": "localhost",
}
response = self.delete_json("/v2/actions/downtime/", params=ack)
response = self.delete_json("/v2/actions/downtime/", params=ack)
self.assertEqual(response.status_int, 200)
self.assertEqual(response.status_int, 200)
self.assert_count_equal_backport(httpretty.last_request().body.decode()
.split('&'),
['host_name=localhost',
'action=delete'])
self.assertEqual(httpretty.last_request().path,
'/downtime')
self.assert_count_equal_backport(m.last_request.body.split('&'),
['host_name=localhost',
'action=delete'])
self.assertEqual(m.last_request.path,
'/downtime')

63
surveil/tests/api/controllers/v2/actions/test_downtime.py
View File

@ -12,51 +12,52 @@
# License for the specific language governing permissions and limitations
# under the License.
import httpretty
import requests_mock
from surveil.tests.api import functionalTest
class TestDowntimeController(functionalTest.FunctionalTest):
@httpretty.activate
def test_downtime_post(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/downtime")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/downtime")
dt = {
"host_name": "localhost",
"duration": 86400
}
dt = {
"host_name": "localhost",
"duration": 86400
}
response = self.post_json("/v2/actions/downtime/", params=dt)
response = self.post_json("/v2/actions/downtime/", params=dt)
self.assertEqual(response.status_int, 200)
self.assertEqual(response.status_int, 200)
self.assert_count_equal_backport(httpretty.last_request().body.decode()
.split('&'),
['host_name=localhost', 'action=add',
'duration=86400'])
self.assertEqual(httpretty.last_request().path,
'/downtime')
self.assert_count_equal_backport(m.last_request.body.split('&'),
['host_name=localhost',
'action=add',
'duration=86400'])
self.assertEqual(m.last_request.path,
'/downtime')
@httpretty.activate
def test_downtime_delete(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/downtime")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/downtime")
dt = {
"host_name": "localhost",
"duration": 86400
}
dt = {
"host_name": "localhost",
"duration": 86400
}
response = self.delete_json("/v2/actions/downtime/", params=dt)
response = self.delete_json("/v2/actions/downtime/", params=dt)
self.assertEqual(response.status_int, 200)
self.assertEqual(response.status_int, 200)
self.assert_count_equal_backport(httpretty.last_request().body.decode()
.split('&'),
['host_name=localhost',
'action=delete', 'duration=86400'])
self.assertEqual(httpretty.last_request().path,
'/downtime')
self.assert_count_equal_backport(m.last_request.body.split('&'),
['host_name=localhost',
'action=delete',
'duration=86400'])
self.assertEqual(m.last_request.path,
'/downtime')

27
surveil/tests/api/controllers/v2/actions/test_recheck.py
View File

@ -12,28 +12,27 @@
# License for the specific language governing permissions and limitations
# under the License.
import httpretty
import requests_mock
from surveil.tests.api import functionalTest
class TestRecheckController(functionalTest.FunctionalTest):
@httpretty.activate
def test_recheck_post(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/recheck")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/recheck")
recheck = {
"host_name": "localhost",
}
recheck = {
"host_name": "localhost",
}
response = self.post_json("/v2/actions/recheck/", params=recheck)
response = self.post_json("/v2/actions/recheck/", params=recheck)
self.assertEqual(response.status_int, 200)
self.assertEqual(response.status_int, 200)
self.assert_count_equal_backport(httpretty.last_request().body.decode()
.split('&'),
['host_name=localhost'])
self.assertEqual(httpretty.last_request().path,
'/recheck')
self.assert_count_equal_backport(m.last_request.body.split('&'),
['host_name=localhost'])
self.assertEqual(m.last_request.path,
'/recheck')

94
surveil/tests/api/controllers/v2/config/test_hosts.py
View File

@ -15,7 +15,8 @@
import copy
import json
import httpretty
import requests_mock
from six.moves import urllib_parse
from surveil.api.datamodel.config import host
from surveil.api.datamodel.config import service
@ -264,55 +265,56 @@ class TestHostController(functionalTest.FunctionalTest):
self.assertEqual(0, len(mongo_services))
@httpretty.activate
def test_submit_service_result(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/push_check_result")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/push_check_result")
check_result = {
"return_code": "0",
"output": "TEST OUTPUT",
"time_stamp": "1409149234"
}
response = self.post_json(
"/v2/config/hosts/bogus-router/services/service-example/results",
params=check_result
)
self.assertEqual(response.status_int, 204)
self.assertEqual(
httpretty.last_request().parsed_body,
{
u'output': [u'TEST OUTPUT'],
u'return_code': [u'0'],
u'service_description': [u'service-example'],
u'host_name': [u'bogus-router'],
u'time_stamp': [u'1409149234']
check_result = {
"return_code": "0",
"output": "TEST OUTPUT",
"time_stamp": "1409149234"
}
)
@httpretty.activate
response = self.post_json(
"/v2/config/hosts/bogus-router/services/" +
"service-example/results",
params=check_result
)
self.assertEqual(response.status_int, 204)
self.assertEqual(
urllib_parse.parse_qs(m.last_request.body),
{
u'output': [u'TEST OUTPUT'],
u'return_code': [u'0'],
u'service_description': [u'service-example'],
u'host_name': [u'bogus-router'],
u'time_stamp': [u'1409149234']
}
)
def test_submit_host_result(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/push_check_result")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/push_check_result")
check_result = {
"return_code": "0",
"output": "TEST OUTPUT",
"time_stamp": "1409149234"
}
response = self.post_json("/v2/config/hosts/bogus-router/results",
params=check_result)
self.assertEqual(response.status_int, 204)
self.assertEqual(
httpretty.last_request().parsed_body,
{
u'output': [u'TEST OUTPUT'],
u'return_code': [u'0'],
u'host_name': [u'bogus-router'],
u'time_stamp': [u'1409149234']
check_result = {
"return_code": "0",
"output": "TEST OUTPUT",
"time_stamp": "1409149234"
}
)
response = self.post_json("/v2/config/hosts/bogus-router/results",
params=check_result)
self.assertEqual(response.status_int, 204)
self.assertEqual(
urllib_parse.parse_qs(m.last_request.body),
{
u'output': [u'TEST OUTPUT'],
u'return_code': [u'0'],
u'host_name': [u'bogus-router'],
u'time_stamp': [u'1409149234']
}
)

20
surveil/tests/api/controllers/v2/config/test_reload_config.py
View File

@ -12,21 +12,21 @@
# License for the specific language governing permissions and limitations
# under the License.
import httpretty
import requests_mock
from surveil.tests.api import functionalTest
class TestReloadConfigController(functionalTest.FunctionalTest):
@httpretty.activate
def test_reload_config(self):
httpretty.register_uri(httpretty.POST,
self.ws_arbiter_url + "/reload")
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.POST,
self.ws_arbiter_url + "/reload")
response = self.post("/v2/config/reload_config")
self.assertEqual(response.status_int, 200)
self.assertEqual(
httpretty.last_request().path,
'/reload'
)
response = self.post("/v2/config/reload_config")
self.assertEqual(response.status_int, 200)
self.assertEqual(
m.last_request.path,
'/reload'
)

117
surveil/tests/api/controllers/v2/status/test_hosts_metric.py
View File

@ -14,7 +14,7 @@
import json
import httpretty
import requests_mock
from surveil.tests.api import functionalTest
@ -83,34 +83,35 @@ class TestHostMetric(functionalTest.FunctionalTest):
]
})
@httpretty.activate
def test_get_metric_hosts(self):
httpretty.register_uri(httpretty.GET,
"http://influxdb:8086/query",
body=self.influxdb_response)
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.GET,
"http://influxdb:8086/query",
text=self.influxdb_response)
response = self.get("/v2/status/hosts/srv-monitoring-01/metrics/load1")
response = self.get(
"/v2/status/hosts/srv-monitoring-01/metrics/load1"
)
expected = {
"metric_name": "load1",
"min": "0",
"critical": "30",
"warning": "15",
"value": "0.6"
}
expected = {
"metric_name": "load1",
"min": "0",
"critical": "30",
"warning": "15",
"value": "0.6"
}
self.assert_count_equal_backport(
json.loads(response.body.decode()),
expected)
self.assertEqual(
httpretty.last_request().querystring['q'],
["SELECT * FROM metric_load1 "
"WHERE host_name= 'srv-monitoring-01' "
"GROUP BY service_description "
"ORDER BY time DESC LIMIT 1"]
)
self.assert_count_equal_backport(
json.loads(response.body.decode()),
expected)
self.assertEqual(
m.last_request.qs['q'],
["select * from metric_load1 "
"where host_name= 'srv-monitoring-01' "
"group by service_description "
"order by time desc limit 1"]
)
@httpretty.activate
def test_time_hosts(self):
self.influxdb_response = json.dumps({
"results": [
@ -136,40 +137,42 @@ class TestHostMetric(functionalTest.FunctionalTest):
"10"]]}]}]
})
httpretty.register_uri(httpretty.GET,
"http://influxdb:8086/query",
body=self.influxdb_response)
time = {'begin': '2015-04-19T00:09:24Z',
'end': '2015-04-19T02:09:25Z'}
with requests_mock.Mocker() as m:
m.register_uri(requests_mock.GET,
"http://influxdb:8086/query",
text=self.influxdb_response)
response = self.post_json("/v2/status/hosts/srv-monitoring-01/"
"services/load/metrics/load1",
params=time)
time = {'begin': '2015-04-19T00:09:24Z',
'end': '2015-04-19T02:09:25Z'}
expected = [{"metric_name": 'load1',
"min": "0",
"critical": "30",
"warning": "15",
"value": "0.6"
},
{"metric_name": 'load1',
"min": "4",
"critical": "40",
"warning": "10",
"value": "10"
}]
response = self.post_json("/v2/status/hosts/srv-monitoring-01/"
"services/load/metrics/load1",
params=time)
self.assert_count_equal_backport(
json.loads(response.body.decode()),
expected)
self.assertEqual(
httpretty.last_request().querystring['q'],
["SELECT * FROM metric_load1 "
"WHERE time >= '2015-04-19T00:09:24Z' "
"AND time <= '2015-04-19T02:09:25Z' "
"AND host_name ='srv-monitoring-01' "
"AND service_description ='load' "
"ORDER BY time DESC"
]
)
expected = [{"metric_name": 'load1',
"min": "0",
"critical": "30",
"warning": "15",
"value": "0.6"
},
{"metric_name": 'load1',
"min": "4",
"critical": "40",
"warning": "10",
"value": "10"
}]
self.assert_count_equal_backport(
json.loads(response.body.decode()),
expected)
self.assertEqual(
m.last_request.qs['q'],
["select * from metric_load1 "
"where time >= '2015-04-19t00:09:24z' "
"and time <= '2015-04-19t02:09:25z' "
"and host_name ='srv-monitoring-01' "
"and service_description ='load' "
"order by time desc"
]
)

2
test-requirements.txt
View File

@ -6,7 +6,7 @@ sphinxcontrib-httpdomain>=1.3.0
oslosphinx>=2.5.0
testrepository>=0.0.18
mongomock
httpretty==0.8.3
requests_mock
sphinx_rtd_theme
docker-compose
python-surveilclient==0.6.0