pbench-metadata-log: fix the unittests.

Author: ndokos

agent/util-scripts/gold/pbench-metadata-log/test-02.txt

@@ -42,6 +42,7 @@ hosts: testhost
 group: default
 
 [tools/testhost]
+hostname-s = testhost
 iostat: --interval=3
 mpstat: --interval=3
 perf: --record-opts=record -a --freq=100

agent/util-scripts/gold/pbench-metadata-log/test-03.txt

@@ -47,10 +47,11 @@ date: 1900-01-01T00:00:00
 rpm-version: 
 
 [tools]
-hosts: testhost  dhcp31-174 perf104
+hosts: testhost dhcp31-174 perf104 
 group: default
 
 [tools/testhost]
+hostname-s = testhost
 iostat: --interval=3
 label: packet-generator
 mpstat: --interval=3
@@ -64,9 +65,11 @@ sar: --interval=3
 turbostat: --interval=3
 
 [tools/dhcp31-174]
+hostname-s = dhcp31-174
 sar:
 
 [tools/perf104]
+hostname-s = perf104
 iostat:
 
 [run]
@@ -78,7 +81,6 @@ grep: /var/tmp/pbench-test-utils/pbench/pbench.log: No such file or directory
 +++ test-execution.log file contents
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/yum list installed pbench-agent
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no -n dhcp31-174 hostname -s
-/var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no -n perf104 hostname -s
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r dhcp31-174:/var/tmp/pbench-test-utils/pbench/tools-default /var/tmp/pbench-test-utils/pbench/tmp/remotes/dhcp31-174
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/pbench/tmp/remotes/dhcp31-174/iostat:foo
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/pbench/tmp/remotes/dhcp31-174/mpstat:bar
@@ -88,6 +90,7 @@ grep: /var/tmp/pbench-test-utils/pbench/pbench.log: No such file or directory
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/pbench/tmp/remotes/dhcp31-174/proc-vmstat:foobar
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/pbench/tmp/remotes/dhcp31-174/sar:foo
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/pbench/tmp/remotes/dhcp31-174/tools-default/sar:/var/tmp/pbench-test-utils/pbench/tmp/remotes/dhcp31-174/turbostat:bar
+/var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -o StrictHostKeyChecking=no -n perf104 hostname -s
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r perf104:/var/tmp/pbench-test-utils/pbench/tools-default /var/tmp/pbench-test-utils/pbench/tmp/remotes/perf104
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/pbench/tmp/remotes/perf104/iostat:foo
 /var/tmp/pbench-test-utils/test-execution.log:/var/tmp/pbench-test-utils/pbench/tmp/remotes/perf104/mpstat:bar

agent/util-scripts/gold/pbench-metadata-log/test-04.txt

@@ -46,6 +46,7 @@ hosts: testhost
 group: default
 
 [tools/testhost]
+hostname-s = testhost
 iostat: --interval=3
 mpstat: --interval=3
 perf: --record-opts=-a -freq=100 --record-opts=--call-graph --record-opts=--event=branch-misses --record-opts=--event=cache-misses --record-opts=--event=instructions

agent/util-scripts/gold/pbench-metadata-log/test-22.txt

@@ -53,6 +53,7 @@ iter3
 /var/tmp/pbench-test-utils/pbench/metadata.log:group = default
 /var/tmp/pbench-test-utils/pbench/metadata.log:
 /var/tmp/pbench-test-utils/pbench/metadata.log:[tools/testhost]
+/var/tmp/pbench-test-utils/pbench/metadata.log:hostname-s = testhost
 /var/tmp/pbench-test-utils/pbench/metadata.log:iostat = --interval=3
 /var/tmp/pbench-test-utils/pbench/metadata.log:mpstat = --interval=3
 /var/tmp/pbench-test-utils/pbench/metadata.log:perf = --record-opts=-a -freq=100 --record-opts=--call-graph --record-opts=--event=branch-misses --record-opts=--event=cache-misses --record-opts=--event=instructions