update agent_failure to run journalctl as user

Skip-test: true
Skip-build: true

Signed-off-by: Dalton Bohning <dalton.bohning@intel.com>

src/tests/ftest/deployment/agent_failure.py

@@ -122,7 +122,7 @@ def test_agent_failure(self):
  # 5. Verify journalctl shows the log that the agent is stopped.
  results = get_journalctl(
  hosts=self.hostlist_clients, since=since, until=until,
- journalctl_type="daos_agent")
+ journalctl_type="daos_agent", run_user=self.test_env.agent_user)
  self.log.info("journalctl results = %s", results)
  if "shutting down" not in results[0]["data"]:
  msg = "Agent shut down message not found in journalctl! Output = {}".format(
@@ -240,7 +240,7 @@ def test_agent_failure_isolation(self):
  # stopped.
  results = get_journalctl(
  hosts=[agent_host_kill], since=since, until=until,
- journalctl_type="daos_agent")
+ journalctl_type="daos_agent", run_user=self.test_env.agent_user)
  self.log.info("journalctl results (kill) = %s", results)
  if "shutting down" not in results[0]["data"]:
  msg = ("Agent shut down message not found in journalctl on killed client! "
@@ -251,7 +251,7 @@ def test_agent_failure_isolation(self):
  # in the previous step doesn't show that the agent is stopped.
  results = get_journalctl(
  hosts=[agent_host_keep], since=since, until=until,
- journalctl_type="daos_agent")
+ journalctl_type="daos_agent", run_user=self.test_env.agent_user)
  self.log.info("journalctl results (keep) = %s", results)
  if "shutting down" in results[0]["data"]:
  msg = ("Agent shut down message found in journalctl on keep client! "

src/tests/ftest/util/general_utils.py

@@ -1062,22 +1062,24 @@ def get_journalctl_command(since, until=None, system=False, units=None, identifi
  return command_as_user(" ".join(command), run_user)
 
 
-def get_journalctl(hosts, since, until, journalctl_type):
+def get_journalctl(hosts, since, until, journalctl_type, run_user="root"):
  """Run the journalctl on the hosts.
 
  Args:
  hosts (list): List of hosts to run journalctl.
  since (str): Start time to search the log.
  until (str): End time to search the log.
  journalctl_type (str): String to search in the log. -t param for journalctl.
+ run_user (str, optional): user to run as. Defaults to root
 
  Returns:
  list: a list of dictionaries containing the following key/value pairs:
  "hosts": NodeSet containing the hosts with this data
  "data": data requested for the group of hosts
 
  """
- command = get_journalctl_command(since, until, True, identifiers=journalctl_type)
+ system = run_user != getuser()
+ command = get_journalctl_command(since, until, system, identifiers=journalctl_type, run_user=run_user)
  err = "Error gathering system log events"
  return get_host_data(hosts=hosts, command=command, text="journalctl", error=err)