iam:fix tests.

ideal-world · Dec 8, 2023 · e63a2dd · e63a2dd
1 parent 9b002ac
commit e63a2dd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/support/iam/tests/test_ca_basic.rs b/support/iam/tests/test_ca_basic.rs
@@ -20,7 +20,7 @@ use bios_iam::console_passport::dto::iam_cp_cert_dto::IamCpUserPwdLoginReq;
 use bios_iam::console_passport::serv::iam_cp_cert_user_pwd_serv::IamCpCertUserPwdServ;
 use bios_iam::iam_constants;
 
-pub async fn test(_context: &TardisContext) -> TardisResult<(TardisContext, TardisContext, TardisContext)> {
+pub async fn test(context: &TardisContext) -> TardisResult<(TardisContext, TardisContext, TardisContext)> {
     let mut funs = iam_constants::get_tardis_inst();
     funs.begin().await?;
 
@@ -64,6 +64,7 @@ pub async fn test(_context: &TardisContext) -> TardisResult<(TardisContext, Tard
             cert_conf_by_ldap: None,
         },
         &funs,
+        &context
     )
     .await?;
     sleep(Duration::from_secs(1)).await;

diff --git a/support/iam/tests/test_cp_all.rs b/support/iam/tests/test_cp_all.rs
@@ -67,6 +67,7 @@ pub async fn test(sysadmin_info: (&str, &str), system_admin_context: &TardisCont
             cert_conf_by_ldap: None,
         },
         &funs,
+        &system_admin_context
     )
     .await?;
     sleep(Duration::from_secs(1)).await;

diff --git a/support/iam/tests/test_cs_tenant.rs b/support/iam/tests/test_cs_tenant.rs
@@ -56,6 +56,7 @@ pub async fn test(context: &TardisContext) -> TardisResult<()> {
             cert_conf_by_ldap: None,
         },
         &funs,
+        &context
     )
     .await?;
 
@@ -98,6 +99,7 @@ pub async fn test(context: &TardisContext) -> TardisResult<()> {
             cert_conf_by_ldap: None,
         },
         &funs,
+        &context
     )
     .await?;
 
@@ -140,6 +142,7 @@ pub async fn test(context: &TardisContext) -> TardisResult<()> {
             cert_conf_by_ldap: None,
         },
         &funs,
+        &context
     )
     .await?
     .0;

diff --git a/support/iam/tests/test_ct_basic.rs b/support/iam/tests/test_ct_basic.rs
@@ -14,7 +14,7 @@ use bios_iam::console_passport::dto::iam_cp_cert_dto::IamCpUserPwdLoginReq;
 use bios_iam::console_passport::serv::iam_cp_cert_user_pwd_serv::IamCpCertUserPwdServ;
 use bios_iam::iam_constants;
 
-pub async fn test(_context: &TardisContext) -> TardisResult<(TardisContext, TardisContext)> {
+pub async fn test(context: &TardisContext) -> TardisResult<(TardisContext, TardisContext)> {
     let mut funs = iam_constants::get_tardis_inst();
     funs.begin().await?;
 
@@ -58,6 +58,7 @@ pub async fn test(_context: &TardisContext) -> TardisResult<(TardisContext, Tard
             cert_conf_by_ldap: None,
         },
         &funs,
+        &context
     )
     .await?;
     sleep(Duration::from_secs(1)).await;
@@ -122,6 +123,7 @@ pub async fn test(_context: &TardisContext) -> TardisResult<(TardisContext, Tard
             cert_conf_by_ldap: None,
         },
         &funs,
+        &context
     )
     .await?;
     sleep(Duration::from_secs(1)).await;

diff --git a/support/iam/tests/test_key_cache.rs b/support/iam/tests/test_key_cache.rs
@@ -73,6 +73,7 @@ pub async fn test(system_admin_context: &TardisContext) -> TardisResult<()> {
             cert_conf_by_ldap: None,
         },
         &funs,
+        &system_admin_context
     )
     .await?;
     IamCertTokenServ::modify_cert_conf(
@@ -446,14 +447,14 @@ pub async fn test(system_admin_context: &TardisContext) -> TardisResult<()> {
     IamRoleServ::modify_role_agg(
         role_id,
         &mut IamRoleAggModifyReq {
-            role: IamRoleModifyReq {
+            role: Some(IamRoleModifyReq {
                 name: None,
                 scope_level: None,
                 disabled: Some(true),
                 icon: None,
                 sort: None,
                 kind: None,
-            },
+            }),
             res_ids: None,
         },
         &funs,
@@ -515,14 +516,14 @@ pub async fn test(system_admin_context: &TardisContext) -> TardisResult<()> {
     IamRoleServ::modify_role_agg(
         role_id,
         &mut IamRoleAggModifyReq {
-            role: IamRoleModifyReq {
+            role: Some(IamRoleModifyReq {
                 name: None,
                 scope_level: None,
                 disabled: Some(false),
                 icon: None,
                 sort: None,
                 kind: None,
-            },
+            }),
             res_ids: None,
         },
         &funs,
@@ -1087,6 +1088,7 @@ pub async fn test(system_admin_context: &TardisContext) -> TardisResult<()> {
             cert_conf_by_ldap: None,
         },
         &funs,
+        &system_admin_context
     )
     .await?;