HDDS-470. Ozone acceptance tests are failing. Contributed by Elek, Marton.

(cherry picked from commit dca8d0c2615d142bca55d367a0bc988ce9860368)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/07385f88
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/07385f88
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/07385f88

Branch: refs/heads/HADOOP-15407
Commit: 07385f886ed534aba527820c0bda4dcf410e05f6
Parents: 82fbbd5
Author: Arpit Agarwal <a...@apache.org>
Authored: Sun Sep 16 14:31:09 2018 -0700
Committer: Arpit Agarwal <a...@apache.org>
Committed: Sun Sep 16 14:31:29 2018 -0700

----------------------------------------------------------------------
 .../test/acceptance/ozonefs/ozonesinglenode.robot | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/07385f88/hadoop-ozone/acceptance-test/src/test/acceptance/ozonefs/ozonesinglenode.robot
----------------------------------------------------------------------
diff --git 
a/hadoop-ozone/acceptance-test/src/test/acceptance/ozonefs/ozonesinglenode.robot
 
b/hadoop-ozone/acceptance-test/src/test/acceptance/ozonefs/ozonesinglenode.robot
index b718bc9..15ad5bb 100644
--- 
a/hadoop-ozone/acceptance-test/src/test/acceptance/ozonefs/ozonesinglenode.robot
+++ 
b/hadoop-ozone/acceptance-test/src/test/acceptance/ozonefs/ozonesinglenode.robot
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 *** Settings ***
-Documentation       Ozonefs Single Node Test
+Documentation       Ozone Single Node Test
 Library             OperatingSystem
 Suite Setup         Startup Ozone cluster with size          1
 Suite Teardown      Teardown Ozone cluster
@@ -27,23 +27,23 @@ ${PROJECTDIR}           ${CURDIR}/../../../../../..
 
 *** Test Cases ***
 Create volume and bucket
-    Execute on          datanode        ozone sh -createVolume 
http://ozoneManager/fstest -user bilbo -quota 100TB -root
-    Execute on          datanode        ozone sh -createBucket 
http://ozoneManager/fstest/bucket1
+    Execute on          datanode        ozone sh volume create 
http://ozoneManager/fstest --user bilbo --quota 100TB --root
+    Execute on          datanode        ozone sh bucket create 
http://ozoneManager/fstest/bucket1
 
 Check volume from ozonefs
     ${result} =         Execute on          datanode          ozone fs -ls 
o3://bucket1.fstest/
 
 Create directory from ozonefs
                         Execute on          datanode          ozone fs -mkdir 
-p o3://bucket1.fstest/testdir/deep
-    ${result} =         Execute on          ozoneManager      ozone sh 
-listKey o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
+    ${result} =         Execute on          ozoneManager      ozone sh key 
list o3://ozoneManager/fstest/bucket1 | grep -v WARN | jq -r '.[].keyName'
                                             Should contain    ${result}        
 testdir/deep
 Test key handling
-                    Execute on          datanode        ozone sh -putKey 
o3://ozoneManager/fstest/bucket1/key1 -file NOTICE.txt -replicationFactor 1
+                    Execute on          datanode        ozone sh key put 
o3://ozoneManager/fstest/bucket1/key1 NOTICE.txt --replication ONE
                     Execute on          datanode        rm -f NOTICE.txt.1
-                    Execute on          datanode        ozone sh -getKey 
o3://ozoneManager/fstest/bucket1/key1 -file NOTICE.txt.1
+                    Execute on          datanode        ozone sh key get 
o3://ozoneManager/fstest/bucket1/key1 NOTICE.txt.1
                     Execute on          datanode        ls -l NOTICE.txt.1
-    ${result} =     Execute on          datanode        ozone sh -infoKey 
o3://ozoneManager/fstest/bucket1/key1 | grep -Ev 
'Removed|WARN|DEBUG|ERROR|INFO|TRACE' | jq -r '. | select(.keyName=="key1")'
+    ${result} =     Execute on          datanode        ozone sh key info 
o3://ozoneManager/fstest/bucket1/key1 | grep -Ev 
'Removed|WARN|DEBUG|ERROR|INFO|TRACE' | jq -r '. | select(.keyName=="key1")'
                     Should contain      ${result}       createdOn
-    ${result} =     Execute on          datanode        ozone sh -listKey 
o3://ozoneManager/fstest/bucket1 | grep -Ev 
'Removed|WARN|DEBUG|ERROR|INFO|TRACE' | jq -r '.[] | select(.keyName=="key1") | 
.keyName'
+    ${result} =     Execute on          datanode        ozone sh key list 
o3://ozoneManager/fstest/bucket1 | grep -Ev 
'Removed|WARN|DEBUG|ERROR|INFO|TRACE' | jq -r '.[] | select(.keyName=="key1") | 
.keyName'
                     Should Be Equal     ${result}       key1
-                    Execute on          datanode        ozone sh -deleteKey 
o3://ozoneManager/fstest/bucket1/key1 -v
+                    Execute on          datanode        ozone sh key delete 
o3://ozoneManager/fstest/bucket1/key1


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to