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


##########
hadoop-ozone/dist/src/main/smoketest/topology/cli.robot:
##########
@@ -22,18 +22,27 @@ Test Timeout        5 minutes
 
 *** Variables ***
 
-
 *** Test Cases ***
 Run printTopology
     ${output} =         Execute          ozone admin printTopology
-                        Should contain   ${output}         
10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net)    IN_SERVICE    /rack2
+                        Should Contain   ${output}         State = HEALTHY
+                        Should Contain          ${output}         IN_SERVICE
+                        Should Match Regexp     ${output}         
.*datanode[-_]\\d+.*IN_SERVICE.*

Review Comment:
   `State = HEALTHY` was not in the original expected content, why is it added?
   
   Why is check for `rack2` removed?



##########
hadoop-ozone/dist/src/main/smoketest/topology/cli.robot:
##########
@@ -22,18 +22,27 @@ Test Timeout        5 minutes
 
 *** Variables ***
 
-
 *** Test Cases ***
 Run printTopology
     ${output} =         Execute          ozone admin printTopology
-                        Should contain   ${output}         
10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net)    IN_SERVICE    /rack2
+                        Should Contain   ${output}         State = HEALTHY
+                        Should Contain          ${output}         IN_SERVICE
+                        Should Match Regexp     ${output}         
.*datanode[-_]\\d+.*IN_SERVICE.*
+
 Run printTopology -o
     ${output} =         Execute          ozone admin printTopology -o
-                        Should contain   ${output}         Location: /rack2
-                        Should contain   ${output}         
10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net) IN_SERVICE
+                        Should Contain   ${output}         State = HEALTHY
+                        Should Contain   ${output}         Location:
+                        Should Match Regexp   ${output}         
.*ozone.*datanode[-_]\\d+.*IN_SERVICE.*
+
 Run printTopology --operational-state IN_SERVICE
     ${output} =         Execute          ozone admin printTopology 
--operational-state IN_SERVICE
-                        Should contain   ${output}         
10.5.0.7(ozone-topology_datanode_4_1.ozone-topology_net)    IN_SERVICE    /rack2
+                        Should Contain   ${output}         State = HEALTHY
+                        Should Contain   ${output}         IN_SERVICE
+                        Should Match Regexp   ${output}         
.*ozone.*datanode[-_]\\d+.*IN_SERVICE.*

Review Comment:
   Let's avoid duplicating assertions.  Please extract a `Keyword` and use it 
in all test cases.



-- 
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