From 083318f18f2ab32d7756046b169d60fc74ef8bb1 Mon Sep 17 00:00:00 2001 From: shawnnqin Date: Wed, 13 Oct 2021 13:22:00 +0800 Subject: [PATCH] Bug fix --- QCloudCSharpSDK/COSXML/Common/CosVersion.cs | 4 ---- QCloudCSharpSDK/COSXMLTests/CITest.cs | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/QCloudCSharpSDK/COSXML/Common/CosVersion.cs b/QCloudCSharpSDK/COSXML/Common/CosVersion.cs index a0323b0..dd5d09c 100644 --- a/QCloudCSharpSDK/COSXML/Common/CosVersion.cs +++ b/QCloudCSharpSDK/COSXML/Common/CosVersion.cs @@ -9,11 +9,7 @@ namespace COSXML.Common { public sealed class CosVersion { -<<<<<<< HEAD private static string SDKVersion = "5.4.24.0"; -======= - private static string SDKVersion = "5.4.23.0"; ->>>>>>> upstream/master public static string GetUserAgent() { diff --git a/QCloudCSharpSDK/COSXMLTests/CITest.cs b/QCloudCSharpSDK/COSXMLTests/CITest.cs index 1accfc6..27e74d4 100644 --- a/QCloudCSharpSDK/COSXMLTests/CITest.cs +++ b/QCloudCSharpSDK/COSXMLTests/CITest.cs @@ -411,7 +411,7 @@ public void TestVideoCensorJobCommit() Assert.NotNull(result.censorJobsResponse.JobsDetail.State); Assert.NotNull(result.censorJobsResponse.JobsDetail.CreationTime); string id = result.censorJobsResponse.JobsDetail.JobId; - Thread.Sleep(60000); + Thread.Sleep(120000); // get video censor job GetVideoCensorJobRequest getRequest = new GetVideoCensorJobRequest(bucket, id);