cosmetic cleanup

nova/log.py

@@ -32,7 +32,6 @@ import json
 import logging
 import logging.handlers
 import os
-import stat
 import sys
 import traceback
 
@@ -258,10 +257,7 @@ class NovaRootLogger(NovaLogger):
                 self.filelog = WatchedFileHandler(logpath)
                 self.addHandler(self.filelog)
                 self.logpath = logpath
-
-                st = os.stat(self.logpath)
-                if st.st_mode != (stat.S_IFREG | FLAGS.logfile_mode):
-                    os.chmod(self.logpath, FLAGS.logfile_mode)
+                os.chmod(self.logpath, FLAGS.logfile_mode)
         else:
             self.removeHandler(self.filelog)
             self.addHandler(self.streamlog)

nova/tests/scheduler/test_vsa_scheduler.py

@@ -210,7 +210,6 @@ class VsaSchedulerTestCase(test.TestCase):
     def setUp(self, sched_class=None):
         super(VsaSchedulerTestCase, self).setUp()
         self.stubs = stubout.StubOutForTesting()
-        self.context_non_admin = context.RequestContext(None, None)
         self.context = context.get_admin_context()
 
         if sched_class is None:

nova/tests/test_vsa.py

@@ -47,7 +47,6 @@ class VsaTestCase(test.TestCase):
         FLAGS.quota_volumes = 100
         FLAGS.quota_gigabytes = 10000
 
-        self.context_non_admin = context.RequestContext(None, None)
         self.context = context.get_admin_context()
 
         volume_types.create(self.context,

nova/tests/test_vsa_volumes.py

@@ -36,8 +36,6 @@ class VsaVolumesTestCase(test.TestCase):
         self.stubs = stubout.StubOutForTesting()
         self.vsa_api = vsa.API()
         self.volume_api = volume.API()
-
-        self.context_non_admin = context.RequestContext(None, None)
         self.context = context.get_admin_context()
 
         self.default_vol_type = self.vsa_api.get_vsa_volume_type(self.context)

nova/tests/test_xenapi.py

@@ -203,7 +203,6 @@ class XenAPIVMTestCase(test.TestCase):
         self.context = context.RequestContext(self.user_id, self.project_id)
         self.conn = xenapi_conn.get_connection(False)
 
-    @test.skip_test("Skip this test meanwhile")
     def test_parallel_builds(self):
         stubs.stubout_loopingcall_delay(self.stubs)