]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/selftest: Update test after fetcher error changes
authorBenjamin Esquivel <benjamin.esquivel@linux.intel.com>
Tue, 4 Oct 2016 20:08:16 +0000 (15:08 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 4 Oct 2016 23:10:10 +0000 (00:10 +0100)
The following poky commit:

4359ef08 base.bbclass: Use bb.fatal() instead of raising FuncFailed

changed the way the fetcher error is reported.

Previous reporting:
...Function failed: Fetcher failure for URL:...

New reporting:
...Fetcher failure for URL:...

Updating how the check is done fixes the test error and accurately
confirms the tested scenario for test_invalid_recipe_src_uri.

[YOCTO #10370]

Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/selftest/bbtests.py

index d8cb835829b6f7c998df19af8b8c19ed0dbf40c7..baae1e0e54833452253a23e7642ec8761f1393ae 100644 (file)
@@ -145,7 +145,7 @@ INHERIT_remove = \"report-error\"
         self.assertEqual(result.status, 1, msg="Command succeded when it should have failed. bitbake output: %s" % result.output)
         self.assertTrue('Fetcher failure: Unable to find file file://invalid anywhere. The paths that were searched were:' in result.output, msg = "\"invalid\" file \
 doesn't exist, yet no error message encountered. bitbake output: %s" % result.output)
-        line = self.getline(result, 'Function failed: Fetcher failure for URL: \'file://invalid\'. Unable to fetch URL from any source.')
+        line = self.getline(result, 'Fetcher failure for URL: \'file://invalid\'. Unable to fetch URL from any source.')
         self.assertTrue(line and line.startswith("ERROR:"), msg = "\"invalid\" file \
 doesn't exist, yet fetcher didn't report any error. bitbake output: %s" % result.output)