openstack/python-aodhclient
Code Issues Proposed changes

cleanup existing tests

Browse Source 
some of these tests don't pass once we enable environment properly
with gnocchi.

Change-Id: I07248e3160367cb489ef8d061196dce0d0d81192
This commit is contained in:
gordon chung
2016-02-11 13:48:42 -05:00
parent 5822734227
commit f894408cc5
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
aodhclient/tests/functional/test_alarm.py
View File

@@ -45,7 +45,8 @@ class AodhClientTest(base.ClientTestBase):
params=(u"create --type event --name ev_alarm1 " params=(u"create --type event --name ev_alarm1 "
"--project-id %s" % PROJECT_ID), "--project-id %s" % PROJECT_ID),
fail_ok=True, merge_stderr=True) fail_ok=True, merge_stderr=True)
self.assertEqual(result.strip(), 'Conflict (HTTP 409)') self.assertFirstLineStartsWith(result.split('\n'),
'Conflict (HTTP 409)')
# UPDATE IGNORE INVALID # UPDATE IGNORE INVALID
result = self.aodh( result = self.aodh(
@@ -103,12 +104,14 @@ class AodhClientTest(base.ClientTestBase):
# GET FAIL # GET FAIL
result = self.aodh('alarm', params="show %s" % ALARM_ID, result = self.aodh('alarm', params="show %s" % ALARM_ID,
fail_ok=True, merge_stderr=True) fail_ok=True, merge_stderr=True)
self.assertEqual(result.strip(), "Not found (HTTP 404)") self.assertFirstLineStartsWith(result.split('\n'),
"Not found (HTTP 404)")
# DELETE FAIL # DELETE FAIL
result = self.aodh('alarm', params="delete %s" % ALARM_ID, result = self.aodh('alarm', params="delete %s" % ALARM_ID,
fail_ok=True, merge_stderr=True) fail_ok=True, merge_stderr=True)
self.assertEqual(result.strip(), "Not found (HTTP 404)") self.assertFirstLineStartsWith(result.split('\n'),
"Not found (HTTP 404)")
# LIST DOES NOT HAVE ALARM # LIST DOES NOT HAVE ALARM
result = self.aodh('alarm', params="list --type event") result = self.aodh('alarm', params="list --type event")
@@ -136,7 +139,8 @@ class AodhClientTest(base.ClientTestBase):
"-m meter_name --threshold 5 " "-m meter_name --threshold 5 "
"--project-id %s" % PROJECT_ID), "--project-id %s" % PROJECT_ID),
fail_ok=True, merge_stderr=True) fail_ok=True, merge_stderr=True)
self.assertEqual(result.strip(), 'Conflict (HTTP 409)') self.assertFirstLineStartsWith(result.split('\n'),
'Conflict (HTTP 409)')
# CREATE FAIL MISSING PARAM # CREATE FAIL MISSING PARAM
self.assertRaises(exceptions.CommandFailed, self.assertRaises(exceptions.CommandFailed,
@@ -195,12 +199,14 @@ class AodhClientTest(base.ClientTestBase):
# GET FAIL # GET FAIL
result = self.aodh('alarm', params="show %s" % ALARM_ID, result = self.aodh('alarm', params="show %s" % ALARM_ID,
fail_ok=True, merge_stderr=True) fail_ok=True, merge_stderr=True)
self.assertEqual(result.strip(), "Not found (HTTP 404)") self.assertFirstLineStartsWith(result.split('\n'),
"Not found (HTTP 404)")
# DELETE FAIL # DELETE FAIL
result = self.aodh('alarm', params="delete %s" % ALARM_ID, result = self.aodh('alarm', params="delete %s" % ALARM_ID,
fail_ok=True, merge_stderr=True) fail_ok=True, merge_stderr=True)
self.assertEqual(result.strip(), "Not found (HTTP 404)") self.assertFirstLineStartsWith(result.split('\n'),
"Not found (HTTP 404)")
# LIST DOES NOT HAVE ALARM # LIST DOES NOT HAVE ALARM
result = self.aodh('alarm', params="list --type threshold") result = self.aodh('alarm', params="list --type threshold")