openstack/glance
Code Issues Proposed changes

Merge "Remove unused parameter from 'stop_server' method"

Browse Source
This commit is contained in:
Jenkins 2017-07-03 09:01:17 +00:00 committed by Gerrit Code Review
commit 69555ae284
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glance/tests/functional/__init__.py
View File

@ -900,7 +900,7 @@ class FunctionalTest(test_utils.BaseTestCase):
return msg if expect_launch else None
def stop_server(self, server, name):
def stop_server(self, server):
"""
Called to stop a single server in a normal fashion using the
glance-control stop method to gracefully shut the server down.
@ -921,10 +921,10 @@ class FunctionalTest(test_utils.BaseTestCase):
"""
# Spin down the API and default registry server
self.stop_server(self.api_server, 'API server')
self.stop_server(self.registry_server, 'Registry server')
self.stop_server(self.api_server)
self.stop_server(self.registry_server)
if self.include_scrubber:
self.stop_server(self.scrubber_daemon, 'Scrubber daemon')
self.stop_server(self.scrubber_daemon)
self._reset_database(self.registry_server.sql_connection)

2
glance/tests/functional/test_scrubber.py
View File

@ -299,7 +299,7 @@ class TestScrubber(functional.FunctionalTest):
self.assertEqual(1, exitcode)
self.assertIn('Can not get scrub jobs from queue', str(err))
self.stop_server(self.scrubber_daemon, 'Scrubber daemon')
self.stop_server(self.scrubber_daemon)
def wait_for_scrub(self, path, headers=None):
"""