From: Tom Barron <tpb@dyncloud.net>
Date: Thu, 19 Mar 2015 23:10:54 +0000 (-0400)
Subject: Fix remaining memory issues with nfs backup unit tests
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1c1d16e77fe8e57dbf9995dcf042bb6aa2b77309;p=openstack-build%2Fcinder-build.git

Fix remaining memory issues with nfs backup unit tests

Here we fix another place in the nfs backup unit tests where
the configured file size was larger than the chunk size in
the corresponding Swift backup tests.  I missed this one in

   https://review.openstack.org/#/c/165394

and even though code with that fix ran fine in a bare 1GB VM,
there are still memory issues when run in CI with a VM of that
size.

Closes-Bug: 1452811
Change-Id: I20dcfb657699e1b415ae2e36ec63f8c6b0049285
---

diff --git a/cinder/tests/unit/backup/drivers/test_backup_nfs.py b/cinder/tests/unit/backup/drivers/test_backup_nfs.py
index 7ac948506..a48e049ba 100644
--- a/cinder/tests/unit/backup/drivers/test_backup_nfs.py
+++ b/cinder/tests/unit/backup/drivers/test_backup_nfs.py
@@ -610,7 +610,6 @@ class BackupNFSSwiftBasedTestCase(test.TestCase):
     def test_restore_uncompressed(self):
         self._create_backup_db_entry()
         self.flags(backup_compression_algorithm='none')
-        self.flags(backup_file_size=(1024 * 1024 * 1024))
         self.flags(backup_sha_block_size_bytes=32)
         service = nfs.NFSBackupDriver(self.ctxt)
         self.volume_file.seek(0)