summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-13 20:09:45 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-14 09:56:36 +0000
commit9ad36e945fa5b03726f78ba99e823eade8daa710 (patch)
treed6ac6480c7cf879d0707722e3ef77ceef4bef68e
parente01b75dff599ffa2b66e6608b28bbb3564365eee (diff)
downloadopenembedded-core-contrib-9ad36e945fa5b03726f78ba99e823eade8daa710.tar.gz
openembedded-core-contrib-9ad36e945fa5b03726f78ba99e823eade8daa710.tar.bz2
openembedded-core-contrib-9ad36e945fa5b03726f78ba99e823eade8daa710.zip
oe-selftest: devtool: improve test_devtool_modify slightly
* Check that man .in file actually gets modified, since sed -i doesn't fail if it it doesn't * Use a variable for man file path Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oeqa/selftest/devtool.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index 3abba0805e..19c5ccf60b 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -439,7 +439,15 @@ class DevtoolTests(DevtoolBase):
# Try building
bitbake('mdadm')
# Try making (minor) modifications to the source
- result = runCmd("sed -i 's!^\.TH.*!.TH MDADM 8 \"\" v9.999-custom!' %s" % os.path.join(tempdir, 'mdadm.8.in'))
+ modfile = os.path.join(tempdir, 'mdadm.8.in')
+ result = runCmd("sed -i 's!^\.TH.*!.TH MDADM 8 \"\" v9.999-custom!' %s" % modfile)
+ sedline = ''
+ with open(modfile, 'r') as f:
+ for line in f:
+ if line.startswith('.TH'):
+ sedline = line.rstrip()
+ break
+ self.assertEqual(sedline, '.TH MDADM 8 "" v9.999-custom', 'man .in file not modified (sed failed)')
bitbake('mdadm -c package')
pkgd = get_bb_var('PKGD', 'mdadm')
self.assertTrue(pkgd, 'Could not query PKGD variable')
@@ -447,10 +455,11 @@ class DevtoolTests(DevtoolBase):
self.assertTrue(mandir, 'Could not query mandir variable')
if mandir[0] == '/':
mandir = mandir[1:]
- with open(os.path.join(pkgd, mandir, 'man8', 'mdadm.8'), 'r') as f:
+ manfile = os.path.join(pkgd, mandir, 'man8', 'mdadm.8')
+ with open(manfile, 'r') as f:
for line in f:
if line.startswith('.TH'):
- self.assertEqual(line.rstrip(), '.TH MDADM 8 "" v9.999-custom', 'man file not modified. man searched file path: %s' % os.path.join(pkgd, mandir, 'man8', 'mdadm.8'))
+ self.assertEqual(line.rstrip(), '.TH MDADM 8 "" v9.999-custom', 'man file not modified. man searched file path: %s' % manfile)
# Test devtool reset
stampprefix = get_bb_var('STAMP', 'mdadm')
result = runCmd('devtool reset mdadm')