summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKei Masumoto <masumotok@nttdata.co.jp>2011-02-23 01:20:39 +0900
committerKei Masumoto <masumotok@nttdata.co.jp>2011-02-23 01:20:39 +0900
commit485a6c5a9502679bc5ecf02f8e758170ac0335dc (patch)
tree2742c61da707e9fe8f8b985a474ac221e7d56691
parentc6b2d07f47004576fa386a6d270203b1d7937664 (diff)
Fixed some docstring
-rw-r--r--nova/scheduler/manager.py2
-rw-r--r--nova/tests/test_scheduler.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py
index 783594c6f..cd5012fd5 100644
--- a/nova/scheduler/manager.py
+++ b/nova/scheduler/manager.py
@@ -59,7 +59,7 @@ class SchedulerManager(manager.Manager):
try:
host = getattr(self.driver, driver_method)(elevated, *args,
**kwargs)
- except AttributeError, e:
+ except AttributeError:
host = self.driver.schedule(elevated, topic, *args, **kwargs)
rpc.cast(context,
diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py
index 47a6d0e82..71e524bca 100644
--- a/nova/tests/test_scheduler.py
+++ b/nova/tests/test_scheduler.py
@@ -60,6 +60,7 @@ class SchedulerTestCase(test.TestCase):
self.flags(scheduler_driver='nova.tests.test_scheduler.TestDriver')
def _create_compute_service(self):
+ """Create compute-manager(ComputeService and Service record)."""
ctxt = context.get_admin_context()
dic = {'host': 'dummy', 'binary': 'nova-compute', 'topic': 'compute',
'report_count': 0, 'availability_zone': 'dummyzone'}
@@ -150,7 +151,7 @@ class SchedulerTestCase(test.TestCase):
db.service_destroy(ctxt, s_ref['id'])
def test_show_host_resources_works_correctly(self):
- """show_host_resources() works correctly as expected."""
+ """Show_host_resources() works correctly as expected."""
scheduler = manager.SchedulerManager()
ctxt = context.get_admin_context()