From f5576793ea78ff35981a78d9691e570b696f3fa7 Mon Sep 17 00:00:00 2001 From: Jacob Gregor Date: Thu, 13 Aug 2015 15:31:16 -0500 Subject: [PATCH] Reduced file size to prevent timeout We currently have a test system that appears to be I/O constrained and is hitting timeouts. Rather than mocking out the file copy, we decided to reduce the file size in order to avoid timeouts. This way we are not changing the way these test cases work, but we are reducing the time required to run each test case. This patch will help improve check and gate performance as well. Change-Id: I04cf9d6dbdaebb8944a38ffa34d1e2e1b27e2552 Closes-bug: 1480361 --- cinder/tests/unit/backup/drivers/test_backup_nfs.py | 4 ++-- cinder/tests/unit/test_backup_swift.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cinder/tests/unit/backup/drivers/test_backup_nfs.py b/cinder/tests/unit/backup/drivers/test_backup_nfs.py index 06a5eeb63..be9186863 100644 --- a/cinder/tests/unit/backup/drivers/test_backup_nfs.py +++ b/cinder/tests/unit/backup/drivers/test_backup_nfs.py @@ -145,7 +145,7 @@ class BackupNFSSwiftBasedTestCase(test.TestCase): mock.Mock(return_value=mock_remotefsclient)) # Remove tempdir. self.addCleanup(shutil.rmtree, self.temp_dir) - for _i in range(0, 128): + for _i in range(0, 32): self.volume_file.write(os.urandom(1024)) def test_backup_uncompressed(self): @@ -261,7 +261,7 @@ class BackupNFSSwiftBasedTestCase(test.TestCase): # Verify sha contents content1 = service._read_sha256file(backup) - self.assertEqual(128 * 1024 / content1['chunk_size'], + self.assertEqual(32 * 1024 / content1['chunk_size'], len(content1['sha256s'])) def test_backup_cmp_shafiles(self): diff --git a/cinder/tests/unit/test_backup_swift.py b/cinder/tests/unit/test_backup_swift.py index 5f6843490..c0fb78690 100644 --- a/cinder/tests/unit/test_backup_swift.py +++ b/cinder/tests/unit/test_backup_swift.py @@ -91,7 +91,7 @@ class BackupSwiftTestCase(test.TestCase): self.addCleanup(self.volume_file.close) # Remove tempdir. self.addCleanup(shutil.rmtree, self.temp_dir) - for _i in range(0, 128): + for _i in range(0, 64): self.volume_file.write(os.urandom(1024)) def test_backup_swift_url(self): @@ -237,7 +237,7 @@ class BackupSwiftTestCase(test.TestCase): # Verify sha contents content1 = service._read_sha256file(backup) - self.assertEqual(128 * 1024 / content1['chunk_size'], + self.assertEqual(64 * 1024 / content1['chunk_size'], len(content1['sha256s'])) def test_backup_cmp_shafiles(self): -- 2.45.2