adoroszlai commented on code in PR #5065:
URL: https://github.com/apache/ozone/pull/5065#discussion_r1265059851


##########
hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell-lib.robot:
##########
@@ -245,21 +245,19 @@ Test native authorizer
     Execute         kdestroy
     Run Keyword     Kinit test user     testuser    testuser.keytab
 
-Test Delete key with and without Trash
+Test Delete key with Trash
     [arguments]    ${protocol}         ${server}       ${volume}
                    Execute               ozone sh volume create 
${protocol}${server}/${volume}
                    Execute               ozone sh bucket create 
${protocol}${server}/${volume}/bfso --layout FILE_SYSTEM_OPTIMIZED
-                   Execute               ozone sh key put -t RATIS 
${protocol}${server}/${volume}/bfso/key1 /opt/hadoop/NOTICE.txt
-                   Execute               ozone sh key delete --skipTrash 
${protocol}${server}/${volume}/bfso/key1
-    ${result} =    Execute               ozone sh key list 
${protocol}${server}/${volume}/bfso
-                   Should not contain    ${result}     key1
+                   Execute               ozone sh key put -t RATIS 
${protocol}${server}/${volume}/bfso/key3 /opt/hadoop/NOTICE.txt
+                   Execute               ozone sh key delete 
${protocol}${server}/${volume}/bfso/key3
+    ${result} =    Execute               ozone sh key list 
${protocol}${server}/${volume}/bfso | jq -r '.[] | select(.name | 
startswith(".Trash")) | .name'
+                   Should Contain Any    ${result}    .Trash/hadoop    
.Trash/testuser    .Trash/root
+                   Should contain        ${result}    key3
+    ${result} =    Execute               ozone sh key list 
${protocol}${server}/${volume}/bfso | jq -r '.[] | select(.name | 
startswith(".Trash") | not) | .name'
+                   Should Not contain    ${result}    key3

Review Comment:
   Also save output to file here.



##########
hadoop-ozone/dist/src/main/smoketest/basic/links.robot:
##########
@@ -114,9 +114,12 @@ Key list passthrough
                         Should Contain              ${source_list}    key2
 
 Key delete passthrough
-                        Execute                     ozone sh key delete 
--skipTrash ${target}/link1/key2
-    ${source_list} =    Execute                     ozone sh key list 
${source}/bucket1 | jq -r '.[].name'
-                        Should Not Contain          ${source_list}    key2
+                        Execute                     ozone sh key delete 
${target}/link1/key2
+    ${source_list} =    Execute                     ozone sh key list 
${source}/bucket1 | jq -r '.[] | select(.name | startswith(".Trash")) | .name'
+                        Should Contain Any          ${source_list}     
.Trash/hadoop    .Trash/testuser    .Trash/root
+                        Should contain              ${source_list}    key2
+    ${result} =         Execute                     ozone sh key list 
${source}/bucket1 | jq -r '.[] | select(.name | startswith(".Trash") | not) | 
.name'
+                        Should Not contain          ${result}         key2

Review Comment:
   Please save output of `ozone sh key list ${source}/bucket1` to a file, and 
apply multiple checks on that file (`jq ... bucket.list`) to avoid multiple 
round-trips to Ozone.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to