You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ae...@apache.org on 2019/06/04 06:30:49 UTC

[hadoop] branch trunk updated: HDDS-1631. Fix auditparser smoketests (#892)

This is an automated email from the ASF dual-hosted git repository.

aengineer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 5d5081e  HDDS-1631. Fix auditparser smoketests (#892)
5d5081e is described below

commit 5d5081eff8e898b5f16481dd87891c11763a0ec8
Author: Elek, Márton <el...@users.noreply.github.com>
AuthorDate: Tue Jun 4 08:30:43 2019 +0200

    HDDS-1631. Fix auditparser smoketests (#892)
---
 hadoop-ozone/dist/src/main/compose/ozone/test.sh                   | 2 +-
 hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test.sh b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
index 1c90175..f36fb48 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
@@ -26,7 +26,7 @@ start_docker_env
 #Due to the limitation of the current auditparser test, it should be the
 #first test in a clean cluster.
 
-execute_robot_test scm auditparser
+execute_robot_test om auditparser
 
 execute_robot_test scm basic/basic.robot
 
diff --git a/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot b/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot
index a4b0b7a..30790ec 100644
--- a/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot
@@ -36,8 +36,9 @@ Initiating freon to generate data
                        Should Not Contain               ${result}  ERROR
 
 Testing audit parser
-    ${logfile} =       Execute              ls -t /opt/hadoop/logs | grep om-audit | head -1
-                       Execute              ozone auditparser /opt/hadoop/audit.db load "/opt/hadoop/logs/${logfile}"
+    ${logdir} =        Get Environment Variable      HADOOP_LOG_DIR     /var/log/hadoop
+    ${logfile} =       Execute              ls -t "${logdir}" | grep om-audit | head -1
+                       Execute              ozone auditparser /opt/hadoop/audit.db load "${logdir}/${logfile}"
     ${result} =        Execute              ozone auditparser /opt/hadoop/audit.db template top5cmds
                        Should Contain       ${result}  ALLOCATE_KEY
     ${result} =        Execute              ozone auditparser /opt/hadoop/audit.db template top5users


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