Skip to content

Commit

Permalink
test_rest.py: changing generated reports name
Browse files Browse the repository at this point in the history
'report1' and 'report2' are common names to be used by
an actual debugreport created by the user. In this case,
test_rest would fail because the report already exists.

This patch changes the names to 'test_rest_report1' and
'test_rest_report2' inside test_rest, making this error
scenario less likely to occur.

Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com>
  • Loading branch information
danielhb committed Oct 18, 2016
1 parent fbfe853 commit c071b52
Showing 1 changed file with 28 additions and 18 deletions.
46 changes: 28 additions & 18 deletions tests/test_rest.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def _report_delete(self, name):
'{}', 'DELETE')

def test_create_debugreport(self):
req = json.dumps({'name': 'report1'})
req = json.dumps({'name': 'test_rest_report1'})
with RollbackContext() as rollback:
resp = request(host, ssl_port, '/plugins/gingerbase/debugreports',
req, 'POST')
Expand All @@ -106,20 +106,24 @@ def test_create_debugreport(self):
# make sure the debugreport doesn't exist until the
# the task is finished
wait_task(self._task_lookup, task['id'])
rollback.prependDefer(self._report_delete, 'report2')
resp = request(host, ssl_port,
'/plugins/gingerbase/debugreports/report1')
rollback.prependDefer(self._report_delete, 'test_rest_report2')
resp = request(
host, ssl_port,
'/plugins/gingerbase/debugreports/test_rest_report1'
)
debugreport = json.loads(resp.read())
self.assertEquals("report1", debugreport['name'])
self.assertEquals("test_rest_report1", debugreport['name'])
self.assertEquals(200, resp.status)
req = json.dumps({'name': 'report2'})
resp = request(host, ssl_port,
'/plugins/gingerbase/debugreports/report1',
req, 'PUT')
req = json.dumps({'name': 'test_rest_report2'})
resp = request(
host, ssl_port,
'/plugins/gingerbase/debugreports/test_rest_report1',
req, 'PUT'
)
self.assertEquals(303, resp.status)

def test_debugreport_download(self):
req = json.dumps({'name': 'report1'})
req = json.dumps({'name': 'test_rest_report1'})
with RollbackContext() as rollback:
resp = request(host, ssl_port, '/plugins/gingerbase/debugreports',
req, 'POST')
Expand All @@ -128,17 +132,23 @@ def test_debugreport_download(self):
# make sure the debugreport doesn't exist until the
# the task is finished
wait_task(self._task_lookup, task['id'], 20)
rollback.prependDefer(self._report_delete, 'report1')
resp = request(host, ssl_port,
'/plugins/gingerbase/debugreports/report1')
rollback.prependDefer(self._report_delete, 'test_rest_report1')
resp = request(
host, ssl_port,
'/plugins/gingerbase/debugreports/test_rest_report1'
)
debugreport = json.loads(resp.read())
self.assertEquals("report1", debugreport['name'])
self.assertEquals("test_rest_report1", debugreport['name'])
self.assertEquals(200, resp.status)
resp = request(host, ssl_port,
'/plugins/gingerbase/debugreports/report1/content')
resp = request(
host, ssl_port,
'/plugins/gingerbase/debugreports/test_rest_report1/content'
)
self.assertEquals(200, resp.status)
resp = request(host, ssl_port,
'/plugins/gingerbase/debugreports/report1')
resp = request(
host, ssl_port,
'/plugins/gingerbase/debugreports/test_rest_report1'
)
debugre = json.loads(resp.read())
resp = request(host, ssl_port, '/' + debugre['uri'])
self.assertEquals(200, resp.status)
Expand Down

0 comments on commit c071b52

Please sign in to comment.