Merge "Remove execute permissions from test files."

2013-05-29 14:44:36 +00:00 · 2013-05-29 14:44:36 +00:00 · 33657e576b
commit 33657e576b
parent b2371aeff9 fa6404eb02
3 changed files with 4 additions and 0 deletions
--- a/cinder/tests/integrated/integrated_helpers.py
+++ b/cinder/tests/integrated/integrated_helpers.py
@ -94,6 +94,10 @@ class _IntegratedTestBase(test.TestCase):
        # Auto-assign ports to allow concurrent tests
        f['osapi_volume_listen_port'] = 0

+        # Use simple scheduler to avoid complications - we test schedulers
+        # separately
+        f['scheduler_driver'] = 'cinder.scheduler.simple.SimpleScheduler'
+
        return f

    def get_unused_server_name(self):
--- a/cinder/tests/integrated/test_volumes.py
+++ b/cinder/tests/integrated/test_volumes.py
--- a/cinder/tests/test_storwize_svc.py
+++ b/cinder/tests/test_storwize_svc.py