diff options
author | Tim Burke <tim.burke@gmail.com> | 2020-06-18 09:41:46 -0700 |
---|---|---|
committer | Tim Burke <tim.burke@gmail.com> | 2020-06-18 09:41:46 -0700 |
commit | 481f126e6b59689599f438e5d27f7328f5b3e813 (patch) | |
tree | 14212db13aee782e95ffd36993d74c6bf35df0cb /test/unit/common/test_db.py | |
parent | b3fd0bd9d82160305a821e742b2cd968036911b2 (diff) | |
parent | 51a587ed8dd5700b558ad26d70dcb7facc0f91e4 (diff) | |
download | swift-feature/losf.tar.gz |
Merge remote-tracking branch 'gerrit/master' into feature/losffeature/losf
Change-Id: If9d7c63f3c4c15fbccff31e2b77a6911bb95972a
Diffstat (limited to 'test/unit/common/test_db.py')
-rw-r--r-- | test/unit/common/test_db.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/unit/common/test_db.py b/test/unit/common/test_db.py index eac9f2394..0f3a308dc 100644 --- a/test/unit/common/test_db.py +++ b/test/unit/common/test_db.py @@ -1154,7 +1154,7 @@ class TestDatabaseBroker(unittest.TestCase): return broker # only testing _reclaim_metadata here - @patch.object(DatabaseBroker, '_reclaim') + @patch.object(DatabaseBroker, '_reclaim', return_value='') def test_metadata(self, mock_reclaim): # Initializes a good broker for us broker = self.get_replication_info_tester(metadata=True) |