diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2016-01-07 11:29:53 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 23:23:16 +0000 |
| commit | 123ca1c3457e472bd3dab5563f7ba5312a9864bf (patch) | |
| tree | 19544abd2a8cb154c1b79e57caac3d371f1cbd48 /meta | |
| parent | c9adb8399687b60eb976ab32d960f4b32af71fea (diff) | |
| download | openembedded-core-123ca1c3457e472bd3dab5563f7ba5312a9864bf.tar.gz openembedded-core-123ca1c3457e472bd3dab5563f7ba5312a9864bf.tar.bz2 openembedded-core-123ca1c3457e472bd3dab5563f7ba5312a9864bf.zip | |
oeqa/runtime/logrotate: fix hardcoded root directory
Use $HOME instead of /home/root in case user changes the default root
directory by ROOT_HOME
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oeqa/runtime/logrotate.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oeqa/runtime/logrotate.py b/meta/lib/oeqa/runtime/logrotate.py index 86d791c300..de300bf55f 100644 --- a/meta/lib/oeqa/runtime/logrotate.py +++ b/meta/lib/oeqa/runtime/logrotate.py @@ -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])) |