From fa6404eb026b45c8194b586498a7df38143a4eca Mon Sep 17 00:00:00 2001 From: Avishay Traeger Date: Fri, 24 May 2013 11:19:51 +0300 Subject: [PATCH] Remove execute permissions from test files. Remove execute permissions from test_volumes.py and test_storwize_svc.py, which caused the tests defined in them to be skipped. Fixing the permissions caused test_create_volume_with_volume_type to execute, which fails. The cause of the failure is that (1) LoggingVolumeDriver doesn't implement get_volume_stats(), and (2) The fake RPC doesn't pass the statistics to the scheduler for some reason. Because this test doesn't test the scheduler, just change to use the simple scheduler and work around the issue. Change-Id: Ie01331d484c5c48c78b626eff1ad793dbbe7182c Fixes: bug 1183416 --- cinder/tests/integrated/integrated_helpers.py | 4 ++++ cinder/tests/integrated/test_volumes.py | 0 cinder/tests/test_storwize_svc.py | 0 3 files changed, 4 insertions(+) mode change 100755 => 100644 cinder/tests/integrated/test_volumes.py mode change 100755 => 100644 cinder/tests/test_storwize_svc.py diff --git a/cinder/tests/integrated/integrated_helpers.py b/cinder/tests/integrated/integrated_helpers.py index ead8bc1dd..b2dc5e739 100644 --- 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): diff --git a/cinder/tests/integrated/test_volumes.py b/cinder/tests/integrated/test_volumes.py old mode 100755 new mode 100644 diff --git a/cinder/tests/test_storwize_svc.py b/cinder/tests/test_storwize_svc.py old mode 100755 new mode 100644 -- 2.45.2