summaryrefslogtreecommitdiff
path: root/smoketest/scripts
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-11-07 22:04:42 +0100
committerChristian Breunig <christian@breunig.cc>2024-11-07 22:11:20 +0100
commit12f9bdf93aa248309fae16883c27f69de4cdc338 (patch)
tree7708dff17ea5a9dbebe78c9fbaa8610e96791aea /smoketest/scripts
parent3eb66e36b81c835f802900c4bc2e973e2657fa31 (diff)
downloadvyos-1x-12f9bdf93aa248309fae16883c27f69de4cdc338.tar.gz
vyos-1x-12f9bdf93aa248309fae16883c27f69de4cdc338.zip
smoketest: T6719: use read_file() over 'sudo cat FILENAME'
Diffstat (limited to 'smoketest/scripts')
-rwxr-xr-xsmoketest/scripts/cli/test_system_syslog.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/smoketest/scripts/cli/test_system_syslog.py b/smoketest/scripts/cli/test_system_syslog.py
index c802ceeeb..d9e16eef8 100755
--- a/smoketest/scripts/cli/test_system_syslog.py
+++ b/smoketest/scripts/cli/test_system_syslog.py
@@ -20,7 +20,6 @@ import unittest
from base_vyostest_shim import VyOSUnitTestSHIM
from vyos.utils.file import read_file
-from vyos.utils.process import cmd
from vyos.utils.process import process_named_running
PROCESS_NAME = 'rsyslogd'
@@ -80,20 +79,22 @@ class TestRSYSLOGService(VyOSUnitTestSHIM.TestCase):
self.assertTrue(process_named_running(PROCESS_NAME))
def test_syslog_global(self):
- self.cli_set(['system', 'host-name', 'vyos'])
- self.cli_set(['system', 'domain-name', 'example.local'])
+ hostname = 'vyos123'
+ domainname = 'example.local'
+ self.cli_set(['system', 'host-name', hostname])
+ self.cli_set(['system', 'domain-name', domainname])
self.cli_set(base_path + ['global', 'marker', 'interval', '600'])
self.cli_set(base_path + ['global', 'preserve-fqdn'])
self.cli_set(base_path + ['global', 'facility', 'kern', 'level', 'err'])
self.cli_commit()
- config = cmd(f'sudo cat {RSYSLOG_CONF}')
+ config = read_file(RSYSLOG_CONF)
expected = [
'$MarkMessagePeriod 600',
'$PreserveFQDN on',
'kern.err',
- '$LocalHostName vyos.example.local',
+ f'$LocalHostName {hostname}.{domainname}',
]
for e in expected: