diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-05-31 15:15:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-31 15:15:21 +0200 |
| commit | 30bd9a9f5a950cbab4705be07a912f73d6dff6e1 (patch) | |
| tree | 660f22912d0b807e40c08fcd7fab72a1467535e9 | |
| parent | ce1614dafe94d11afdb6af15caf3be75498ac4ae (diff) | |
| parent | e4949bbef89faf3c9841eff0d6a5f906e8588d64 (diff) | |
| download | meta-updater-30bd9a9f5a950cbab4705be07a912f73d6dff6e1.tar.gz | |
Merge pull request #326 from advancedtelematic/bugfix/oe-selftest-master
updater.py: Fix test broken by man/man-db upgrade.
| -rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 2efef15..dc3f3a2 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py | |||
| @@ -71,17 +71,17 @@ class GeneralTests(OESelftestTestCase): | |||
| 71 | 71 | ||
| 72 | logger.info('Running bitbake with man in the image package list') | 72 | logger.info('Running bitbake with man in the image package list') |
| 73 | self.append_config('IMAGE_INSTALL_append = " man "') | 73 | self.append_config('IMAGE_INSTALL_append = " man "') |
| 74 | bitbake('-c cleanall man') | 74 | bitbake('-c cleanall man-db') |
| 75 | bitbake('core-image-minimal') | 75 | bitbake('core-image-minimal') |
| 76 | result = runCmd('oe-pkgdata-util find-path /usr/bin/man') | 76 | result = runCmd('oe-pkgdata-util find-path /usr/bin/man') |
| 77 | self.assertEqual(result.output, 'man: /usr/bin/man') | 77 | self.assertEqual(result.output, 'man-db: /usr/bin/man') |
| 78 | path1 = os.path.realpath(image_path) | 78 | path1 = os.path.realpath(image_path) |
| 79 | size1 = os.path.getsize(path1) | 79 | size1 = os.path.getsize(path1) |
| 80 | logger.info('First image %s has size %i' % (path1, size1)) | 80 | logger.info('First image %s has size %i' % (path1, size1)) |
| 81 | 81 | ||
| 82 | logger.info('Running bitbake without man in the image package list') | 82 | logger.info('Running bitbake without man in the image package list') |
| 83 | self.append_config('IMAGE_INSTALL_remove = " man "') | 83 | self.append_config('IMAGE_INSTALL_remove = " man "') |
| 84 | bitbake('-c cleanall man') | 84 | bitbake('-c cleanall man-db') |
| 85 | bitbake('core-image-minimal') | 85 | bitbake('core-image-minimal') |
| 86 | result = runCmd('oe-pkgdata-util find-path /usr/bin/man', ignore_status=True) | 86 | result = runCmd('oe-pkgdata-util find-path /usr/bin/man', ignore_status=True) |
| 87 | self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output) | 87 | self.assertEqual(result.status, 1, "Status different than 1. output: %s" % result.output) |