mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 12:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/runtime/logrotate: fix hardcoded root directory

Browse Source 
Use $HOME instead of /home/root in case user changes the default root
directory by ROOT_HOME

(From OE-Core rev: 123ca1c3457e472bd3dab5563f7ba5312a9864bf)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yi Zhao
2016-01-07 11:29:53 +08:00
committed by Richard Purdie
parent cce6c3ed9a
commit 235606f31b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meta/lib/oeqa/runtime/logrotate.py
View File

@@ -14,9 +14,9 @@ class LogrotateTest(oeRuntimeTest):
@skipUnlessPassed("test_ssh")
def test_1_logrotate_setup(self):
(status, output) = self.target.run('mkdir /home/root/logrotate_dir')
(status, output) = self.target.run('mkdir $HOME/logrotate_dir')
self.assertEqual(status, 0, msg = "Could not create logrotate_dir. Output: %s" % output)
(status, output) = self.target.run("sed -i 's#wtmp {#wtmp {\\n olddir /home/root/logrotate_dir#' /etc/logrotate.conf")
(status, output) = self.target.run("sed -i \"s#wtmp {#wtmp {\\n olddir $HOME/logrotate_dir#\" /etc/logrotate.conf")
self.assertEqual(status, 0, msg = "Could not write to logrotate.conf file. Status and output: %s and %s)" % (status, output))
@testcase(289)
@@ -24,5 +24,5 @@ class LogrotateTest(oeRuntimeTest):
def test_2_logrotate(self):
(status, output) = self.target.run('logrotate -f /etc/logrotate.conf')
self.assertEqual(status, 0, msg = "logrotate service could not be reloaded. Status and output: %s and %s" % (status, output))
output = self.target.run('ls -la /home/root/logrotate_dir/ | wc -l')[1]
self.assertTrue(int(output)>=3, msg = "new logfile could not be created. List of files within log directory: %s" %(self.target.run('ls -la /home/root/logrotate_dir')[1]))
output = self.target.run('ls -la $HOME/logrotate_dir/ | wc -l')[1]
self.assertTrue(int(output)>=3, msg = "new logfile could not be created. List of files within log directory: %s" %(self.target.run('ls -la $HOME/logrotate_dir')[1]))