Merge pull request #282 from ndokos/wip-activate-unit-test

Fix pbench-agent-config-activate and add unit test.

Author: portante

agent/util-scripts/gold/pbench-agent-config-activate/test-14.txt

@@ -0,0 +1,50 @@
++++ Running test-14 pbench-agent-config-activate
+--- Finished test-14 pbench-agent-config-activate (status=0}
++++ pbench tree state
+/var/tmp/pbench-test-utils/pbench
+/var/tmp/pbench-test-utils/pbench/tmp
+/var/tmp/pbench-test-utils/pbench/tmp/pbench-agent.cfg
+/var/tmp/pbench-test-utils/pbench/tmp/pbench-agent.cfg:
+[DEFAULT]
+pbench_install_dir = /opt/pbench-agent
+pbench_results_redirector = pbench.perf.lab.eng.bos.redhat.com
+pbench_web_server = pbench.perf.lab.eng.bos.redhat.com
+
+[pbench-agent]
+install-dir = %(pbench_install_dir)s
+pbench_user = pbench
+pbench_group = pbench
+pbench_run = /var/lib/pbench-agent
+pbench_log = %(pbench_run)s/pbench.log
+
+[pbench-agent-internal]
+install-dir = /opt/pbench-agent-internal
+
+[results]
+user = pbench
+host_path = http://%(pbench_results_redirector)s/pbench-archive-host
+dir = /pbench/public_html/incoming
+ssh_opts = -o StrictHostKeyChecking=no
+webserver = %(pbench_web_server)s
+host_info_url = http://%(webserver)s/pbench-results-host-info.versioned/pbench-results-host-info.URL001
+
+[pbench/tools]
+default-tool-set = sar, iostat, mpstat, pidstat, proc-vmstat, proc-interrupts, turbostat
+interval = 3
+
+[sosreports]
+# if you want to collect rpm -q information, uncomment the rpm-options
+# line and (after having set up your remotes) execute pbench-distribute-config-file
+# to propagate the change to all the remotes.
+# rpm-options = -o rpm rpm.rpmq on
+
+[config]
+path = %(pbench_install_dir)s/config
+files = pbench-agent.cfg
+--- pbench tree state
++++ pbench.log file contents
+grep: /var/tmp/pbench-test-utils/pbench/pbench.log: No such file or directory
+--- pbench.log file contents
++++ test-execution.log file contents
+grep: /var/tmp/pbench-test-utils/test-execution.log: No such file or directory
+--- test-execution.log file contents

agent/util-scripts/pbench-agent-config-activate

@@ -15,15 +15,19 @@ case $# in
 esac
 
 # check that the config file exists
-if [ ! -f $configfile] ;then
+if [ ! -f $configfile ] ;then
     echo "$prog: $configfile file does not exist"
     exit 4
 fi
 
 # copy the configuration file to the destination
 # use the "real" config file to get the destination
 dest=$(getconf.py --config $configfile pbench_install_dir pbench-agent)
-dest=$dest/config/pbench-agent.cfg
+if [[ $_PBENCH_BENCH_TESTS -eq 1 ]] ;then
+    dest=$pbench_config/config/pbench-agent.cfg
+else
+    dest=$dest/config/pbench-agent.cfg
+fi
 cp $configfile $dest
 exit $?
 

agent/util-scripts/samples/pbench-agent-config-activate/test-14/tmp/pbench-agent.cfg

@@ -0,0 +1,36 @@
+[DEFAULT]
+pbench_install_dir = /opt/pbench-agent
+pbench_results_redirector = pbench.perf.lab.eng.bos.redhat.com
+pbench_web_server = pbench.perf.lab.eng.bos.redhat.com
+
+[pbench-agent]
+install-dir = %(pbench_install_dir)s
+pbench_user = pbench
+pbench_group = pbench
+pbench_run = /var/lib/pbench-agent
+pbench_log = %(pbench_run)s/pbench.log
+
+[pbench-agent-internal]
+install-dir = /opt/pbench-agent-internal
+
+[results]
+user = pbench
+host_path = http://%(pbench_results_redirector)s/pbench-archive-host
+dir = /pbench/public_html/incoming
+ssh_opts = -o StrictHostKeyChecking=no
+webserver = %(pbench_web_server)s
+host_info_url = http://%(webserver)s/pbench-results-host-info.versioned/pbench-results-host-info.URL001
+
+[pbench/tools]
+default-tool-set = sar, iostat, mpstat, pidstat, proc-vmstat, proc-interrupts, turbostat
+interval = 3
+
+[sosreports]
+# if you want to collect rpm -q information, uncomment the rpm-options
+# line and (after having set up your remotes) execute pbench-distribute-config-file
+# to propagate the change to all the remotes.
+# rpm-options = -o rpm rpm.rpmq on
+
+[config]
+path = %(pbench_install_dir)s/config
+files = pbench-agent.cfg

agent/util-scripts/unittests

@@ -20,6 +20,8 @@ _testdir=$_testroot/pbench
 # Copy util-scripts execution environment to _testroot
 _testopt=$_testroot/opt/pbench-agent
 res=0
+mkdir -p $_testopt/config
+let res=res+$?
 mkdir -p $_testopt/util-scripts
 let res=res+$?
 cp $_tdir/../base $_testopt/
@@ -58,7 +60,7 @@ function _run {
     shift
     echo "$tname $tscrpt $@"
     echo "+++ Running $tname $tscrpt" >> $_testout
-    benchmark_bin=$_testopt/unittest-scripts/bm pbench_run=$_testdir pbench_log=$_testdir/pbench.log $_testopt/util-scripts/$tscrpt $@ >> $_testout 2>&1
+    benchmark_bin=$_testopt/unittest-scripts/bm pbench_run=$_testdir pbench_log=$_testdir/pbench.log pbench_config=$_testopt $_testopt/util-scripts/$tscrpt $@ >> $_testout 2>&1
     sts=$?
     echo "--- Finished $tname $tscrpt (status=$sts}" >> $_testout
     return $sts
@@ -140,20 +142,22 @@ let errs=0
 
 tests="$*"
 if [ -z "$tests" ] ;then
-    tests="test-00 test-01 test-02 test-03 test-04"
+    tests="test-00 test-01 test-02 test-03 test-04 test-14"
 fi
 
 declare -A tools=([test-00]="pbench-register-tool"
                   [test-01]="pbench-metadata-log"
                   [test-02]="pbench-metadata-log"
                   [test-03]="pbench-metadata-log"
                   [test-04]="pbench-metadata-log"
+                  [test-14]="pbench-agent-config-activate"
                  )
 declare -A options=([test-00]="--name=mpstat --group=default -- --interval=10"
                     [test-01]="--dir=$_testdir/tmp beg"
                     [test-02]="--dir=$_testdir/tmp beg"
                     [test-03]="--dir=$_testdir/tmp beg"
                     [test-04]="--dir=$_testdir/tmp beg"
+                    [test-14]="$_testdir/tmp/pbench-agent.cfg"
                    )