🐞 fix(TSG-7599): 上传失败也会调用回调函数，使用者可根据错误信息进行合理作业

3 files changed, 18 insertions, 8 deletions

diff --git a/gtest/gtest_hos_upload_buff.cpp b/gtest/gtest_hos_upload_buff.cpp
index 9ac78b06..c12eaf26 100644
--- a/gtest/gtest_hos_upload_buff.cpp
+++ b/gtest/gtest_hos_upload_buff.cpp
@@ -50,22 +50,25 @@ static void gtest_hos_instance_init(hos_instance instance)
     instance->hos_url_prefix = "http://127.0.0.1:9098/hos/";
 }
 
-static void hos_callback(bool result, const char *bucket, const char *object, const char *error, void *userdata)
+static void hos_callback(bool result, const char *bucket, const char *object, const char *error, size_t errorcode, void *userdata)
 {
     SUCCEED();
     EXPECT_EQ(result, true);
     EXPECT_STREQ(bucket, HOS_BUCKET);
     EXPECT_STREQ(object, (char *)userdata);
     EXPECT_STREQ(error, NULL);
+    EXPECT_EQ(error, nullptr);
+    EXPECT_EQ(errorcode, 0);
 }
 
-static void hos_bucket_not_exits_cb(bool result, const char *bucket, const char *object, const char *error, void *userdata)
+static void hos_bucket_not_exits_cb(bool result, const char *bucket, const char *object, const char *error, size_t errorcode, void *userdata)
 {
     SUCCEED();
     EXPECT_EQ(result, false);
     EXPECT_STREQ(bucket, "bucket_not_exits");
     EXPECT_STREQ(object, (char *)userdata);
     EXPECT_STREQ(error, "The specified bucket does not exist.");
+    EXPECT_EQ(errorcode, NO_SUCH_BUCKET);
 }
 
 TEST(hos_upload_buff, normal)
diff --git a/gtest/gtest_hos_upload_file.cpp b/gtest/gtest_hos_upload_file.cpp
index 57a22e72..23c47010 100644
--- a/gtest/gtest_hos_upload_file.cpp
+++ b/gtest/gtest_hos_upload_file.cpp
@@ -50,22 +50,25 @@ static void gtest_hos_instance_init(hos_instance instance)
     instance->hos_url_prefix = "http://127.0.0.1:9098/hos/";
 }
 
-static void hos_callback(bool result, const char *bucket, const char *object, const char *error, void *userdata)
+static void hos_callback(bool result, const char *bucket, const char *object, const char *error, size_t errorcode, void *userdata)
 {
     SUCCEED();
     EXPECT_EQ(result, true);
     EXPECT_STREQ(bucket, HOS_BUCKET);
     EXPECT_STREQ(object, (char *)userdata);
     EXPECT_STREQ(error, NULL);
+    EXPECT_EQ(error, nullptr);
+    EXPECT_EQ(errorcode, 0);
 }
 
-static void hos_bucket_not_exits_cb(bool result, const char *bucket, const char *object, const char *error, void *userdata)
+static void hos_bucket_not_exits_cb(bool result, const char *bucket, const char *object, const char *error, size_t errorcode, void *userdata)
 {
     SUCCEED();
     EXPECT_EQ(result, false);
     EXPECT_STREQ(bucket, HOS_CONF);
     EXPECT_STREQ(object, (char *)userdata);
     EXPECT_STREQ(error, "The specified bucket does not exist.");
+    EXPECT_EQ(errorcode, NO_SUCH_BUCKET);
 }
 
 TEST(hos_upload_file, normal)
diff --git a/gtest/gtest_hos_write.cpp b/gtest/gtest_hos_write.cpp
index 9f46d6f3..256fe014 100644
--- a/gtest/gtest_hos_write.cpp
+++ b/gtest/gtest_hos_write.cpp
@@ -66,40 +66,44 @@ static void gtest_hos_fd_init(hos_fd_context_t *fd_info)
     fd_info->userdata = NULL;
 }
 
-static void hos_callback(bool result, const char *bucket, const char *object, const char *error, void *userdata)
+static void hos_callback(bool result, const char *bucket, const char *object, const char *error, size_t errorcode, void *userdata)
 {
     SUCCEED();
     EXPECT_EQ(result, true);
     EXPECT_STREQ(bucket, HOS_BUCKET);
     EXPECT_STREQ(object, (char *)userdata);
     EXPECT_STREQ(error, NULL);
+    EXPECT_EQ(errorcode, 0);
 }
 
-static void hos_write_buff_cb(bool result, const char *bucket, const char *object, const char *error, void *userdata)
+static void hos_write_buff_cb(bool result, const char *bucket, const char *object, const char *error, size_t errorcode, void *userdata)
 {
     SUCCEED();
     EXPECT_EQ(result, true);
     EXPECT_STREQ(bucket, HOS_BUCKET);
     EXPECT_STREQ(object, (char *)userdata);
     EXPECT_STREQ(error, NULL);
+    EXPECT_EQ(errorcode, 0);
 }
 
-static void hos_write_append_cb(bool result, const char *bucket, const char *object, const char *error, void *userdata)
+static void hos_write_append_cb(bool result, const char *bucket, const char *object, const char *error, size_t errorcode, void *userdata)
 {
     SUCCEED();
     EXPECT_EQ(result, true);
     EXPECT_STREQ(bucket, HOS_BUCKET);
     EXPECT_STREQ(object, (char *)userdata);
     EXPECT_STREQ(error, NULL);
+    EXPECT_EQ(errorcode, 0);
 }
 
-static void hos_bucket_not_exits_cb(bool result, const char *bucket, const char *object, const char *error, void *userdata)
+static void hos_bucket_not_exits_cb(bool result, const char *bucket, const char *object, const char *error, size_t errorcode, void *userdata)
 {
     SUCCEED();
     EXPECT_EQ(result, false);
     EXPECT_STREQ(bucket, "bucket_not_exits");
     EXPECT_STREQ(object, (char *)userdata);
     EXPECT_STREQ(error, "The specified bucket does not exist.");
+    EXPECT_EQ(errorcode, NO_SUCH_BUCKET);
 }
 
 TEST(hos_write, normal)