summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/selftest
diff options
context:
space:
mode:
authorCostin Constantin <costin.c.constantin@intel.com>2015-07-16 16:20:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-23 08:48:38 +0100
commit68f546e6cbe36c9b4b5c1c67784eb035578155d4 (patch)
tree10cf15d2c437d5c9ef7d8bdd4c4c984674baee2c /meta/lib/oeqa/selftest
parent9d02d3fd0222c02982b34ce7b9c6e63fdbbdf808 (diff)
downloadpoky-68f546e6cbe36c9b4b5c1c67784eb035578155d4.tar.gz
oeqa/recipetool: add useful failure messages to test cases
(From OE-Core rev: e555646ecb1ee9c7b00ec22f0d40bdd9da1b4dfd) Signed-off-by: Costin Constantin <costin.c.constantin@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/selftest')
-rw-r--r--meta/lib/oeqa/selftest/recipetool.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py
index 08ff4f14e0..12c6b255ea 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/meta/lib/oeqa/selftest/recipetool.py
@@ -50,7 +50,7 @@ class RecipetoolTests(DevtoolBase):
50 bbappendfile = self._check_bbappend(testrecipe, recipefile, templayerdir) 50 bbappendfile = self._check_bbappend(testrecipe, recipefile, templayerdir)
51 # Check the bbappend contents 51 # Check the bbappend contents
52 with open(bbappendfile, 'r') as f: 52 with open(bbappendfile, 'r') as f:
53 self.assertEqual(expectedlines, f.readlines()) 53 self.assertEqual(expectedlines, f.readlines(), "Expected lines are not present in %s" % bbappendfile)
54 # Check file was copied 54 # Check file was copied
55 filesdir = os.path.join(os.path.dirname(bbappendfile), testrecipe) 55 filesdir = os.path.join(os.path.dirname(bbappendfile), testrecipe)
56 for expectedfile in expectedfiles: 56 for expectedfile in expectedfiles:
@@ -109,7 +109,7 @@ class RecipetoolTests(DevtoolBase):
109 # But file should have 109 # But file should have
110 copiedfile = os.path.join(os.path.dirname(bbappendfile), 'coreutils', testfile2name) 110 copiedfile = os.path.join(os.path.dirname(bbappendfile), 'coreutils', testfile2name)
111 result = runCmd('diff -q %s %s' % (testfile2, copiedfile), ignore_status=True) 111 result = runCmd('diff -q %s %s' % (testfile2, copiedfile), ignore_status=True)
112 self.assertNotEqual(result.status, 0, 'New file should have been copied but was not') 112 self.assertNotEqual(result.status, 0, 'New file should have been copied but was not %s' % result.output)
113 113
114 @testcase(1178) 114 @testcase(1178)
115 def test_recipetool_appendfile_binary(self): 115 def test_recipetool_appendfile_binary(self):