From c36e789cdb8052f3b28c8367e803876a06cf9c06 Mon Sep 17 00:00:00 2001 From: Jianjian Huo Date: Wed, 17 Dec 2025 20:20:02 -0800 Subject: [PATCH] proxy/test_server.py: test_policy_IO_override timestamp refactoring. Change-Id: Ic0e49ceed5afff093952da5a282c043a51d7c490 Signed-off-by: Jianjian Huo --- test/unit/proxy/test_server.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/unit/proxy/test_server.py b/test/unit/proxy/test_server.py index af4f30c325..99029f46e7 100644 --- a/test/unit/proxy/test_server.py +++ b/test/unit/proxy/test_server.py @@ -67,7 +67,7 @@ from swift.common.middleware import proxy_logging, versioned_writes, \ copy, listing_formats from swift.common.middleware.acl import parse_acl, format_acl from swift.common.exceptions import ChunkReadTimeout, DiskFileNotExist, \ - APIVersionError, ChunkReadError + DiskFileDeleted, APIVersionError, ChunkReadError from swift.common import utils, constraints, registry from swift.common.utils import hash_path, storage_directory, \ ShardRange, parse_content_type, parse_mime_headers, \ @@ -2755,12 +2755,9 @@ class TestReplicatedObjectController( df = df_mgr.get_diskfile(node['device'], partition, 'a', 'c1', 'wrong-o', policy=POLICIES[2]) - try: + with self.assertRaises(DiskFileDeleted) as cm: df.open() - except DiskFileNotExist as e: - self.assertGreater(float(e.timestamp), 0) - else: - self.fail('did not raise DiskFileNotExist') + self.assertGreater(cm.exception.timestamp, utils.Timestamp.zero()) @unpatch_policies def test_GET_newest_large_file(self):