|
@@ -10,6 +10,19 @@ class BuildhistoryDiffTests(BuildhistoryBase):
|
|
|
target = 'xcursor-transparent-theme'
|
|
|
self.run_buildhistory_operation(target, target_config="PR = \"r1\"", change_bh_location=True)
|
|
|
self.run_buildhistory_operation(target, target_config="PR = \"r0\"", change_bh_location=False, expect_error=True)
|
|
|
+ result = runCmd("oe-pkgdata-util read-value PKGV %s" % target)
|
|
|
+ pkgv = result.output.rstrip()
|
|
|
result = runCmd("buildhistory-diff -p %s" % get_bb_var('BUILDHISTORY_DIR'))
|
|
|
- expected_output = 'PR changed from "r1" to "r0"'
|
|
|
- self.assertTrue(expected_output in result.output, msg="Did not find expected output: %s" % result.output)
|
|
|
+ expected_endlines = [
|
|
|
+ "xcursor-transparent-theme-dev: RDEPENDS: removed \"xcursor-transparent-theme (['= %s-r1'])\", added \"xcursor-transparent-theme (['= %s-r0'])\"" % (pkgv, pkgv),
|
|
|
+ "xcursor-transparent-theme-staticdev: RDEPENDS: removed \"xcursor-transparent-theme-dev (['= %s-r1'])\", added \"xcursor-transparent-theme-dev (['= %s-r0'])\"" % (pkgv, pkgv)
|
|
|
+ ]
|
|
|
+ for line in result.output.splitlines():
|
|
|
+ for el in expected_endlines:
|
|
|
+ if line.endswith(el):
|
|
|
+ expected_endlines.remove(el)
|
|
|
+ break
|
|
|
+ else:
|
|
|
+ self.fail('Unexpected line:\n%s\nExpected line endings:\n %s' % (line, '\n '.join(expected_endlines)))
|
|
|
+ if expected_endlines:
|
|
|
+ self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines))
|