[OE-core] [PATCH 3/3] bitbake-prserv-tool: check file name

[Burton, Ross]

On 20 October 2015 at 10:25, Robert Yang <liezhi.yang at windriver.com> wrote:

> Fixed:
> $ bitbake-prserv-tool import /tmp/1
>   File "/path/to/lib/bb/parse/__init__.py", line 114, in
> handle(fn='/tmp/1', data=<bb.data_smart.DataSmart object at 0x2369bd0>,
> include=True):
>                      return h['handle'](fn, data, include)
>     >    raise ParseError("not a BitBake file", fn)
>
> ParseError: ParseError in /tmp/1: not a BitBake file
>
> But 1.conf works well, its help also shows "<file.conf>", so check the
> filename and print proper error message.
>

This breaks the selftest:

======================================================================
FAIL: test_import_export_override_db
(oeqa.selftest.prservice.BitbakePrTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/utils/decorators.py",
line 106, in wrapped_f
    return func(*args, **kwargs)
  File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/prservice.py",
line 97, in test_import_export_override_db
    self.run_test_pr_export_import('m4', replace_current_db=False)
  File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/prservice.py",
line 74, in run_test_pr_export_import
    self.assertEqual(export_result.status, 0, msg="PR Service database
export failed: %s" % export_result.output)
AssertionError: 1 != 0 : PR Service database export failed: ERROR:
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/export.inc
must end with .conf!

======================================================================
FAIL: test_import_export_replace_db (oeqa.selftest.prservice.BitbakePrTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/utils/decorators.py",
line 106, in wrapped_f
    return func(*args, **kwargs)
  File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/prservice.py",
line 93, in test_import_export_replace_db
    self.run_test_pr_export_import('m4')
  File
"/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/prservice.py",
line 74, in run_test_pr_export_import
    self.assertEqual(export_result.status, 0, msg="PR Service database
export failed: %s" % export_result.output)
AssertionError: 1 != 0 : PR Service database export failed: ERROR:
/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/export.inc
must end with .conf!

Ross
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20151109/c8d2da0e/attachment-0002.html>