=================================== FAILURES =================================== _________________________________ test_listing _________________________________
differences = [<Difference cbfstool {} print -- cbfstool {} print []>, <Difference text -- text []>] @skip_unless_tools_exist('cbfstool') def test_listing(differences): expected_diff = open(data('cbfs_listing_expected_diff')).read() > assert differences[0].unified_diff == expected_diff E assert '@@ -1,3 +1,3... 31896\n' == '@@ -1,6 +1,3 ... 31896\n' E - @@ -1,3 +1,3 @@ E ? ^ E + @@ -1,6 +1,3 @@ E ? ^ E + -32 kB, bootblocksize 0, romsize 32768, offset 0x0 E + -alignment: 64 bytes, architecture: x86 E + - E Name Offset Type Size E -text 0x0 raw 446 E -(empty) 0x200 null 32152 E +text 0x0 raw 671 E +(empty) 0x300 null 31896 tests/comparators/test_cbfs.py:79: AssertionError ---------------------------- Captured stdout setup ----------------------------- --- /tmp/pytest-of-zbyszek/pytest-1/test_listing0/coreboot1 +++ /tmp/pytest-of-zbyszek/pytest-1/test_listing0/coreboot2.rom ├── cbfstool {} print │ @@ -1,3 +1,3 @@ │ Name Offset Type Size │ -text 0x0 raw 446 │ -(empty) 0x200 null 32152 │ +text 0x0 raw 671 │ +(empty) 0x300 null 31896 ├── text │ @@ -1,6 +1,12 @@ │ +A common form of lorem ipsum reads: │ + │ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor │ incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis │ nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. │ Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu │ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in │ culpa qui officia deserunt mollit anim id est laborum. │ + │ +"Lorem ipsum" text is derived from sections 1.10.32--3 of Cicero's De finibus │ +bonorum et malorum (On the Ends of Goods and Evils, or alternatively [About] │ +The Purposes of Good and Evil). ╵ ---------------------------- Captured stderr setup ----------------------------- Created CBFS (capacity = 32664 bytes) Created CBFS (capacity = 32664 bytes) __________________________________ test_diff ___________________________________ differences = [<Difference cd-iccdump {} -- cd-iccdump {} []>] @skip_unless_tools_exist('cd-iccdump') def test_diff(differences): expected_diff = open(data('icc_expected_diff')).read() > assert differences[0].unified_diff == expected_diff E assert '@@ -1,20 +1,... [24 bytes]\n' == '@@ -1,20 +1,2... [24 bytes]\n' E @@ -1,20 +1,20 @@ E icc: E Header: E Size = 14684 bytes E Version = 4.3 E Profile Kind = display-device E Colorspace = rgb E Conn. Space = xyz E - Date, Time = 2016-02-15, 21:02:09 E + Date, Time = 2016-02-15, 21:03:22 E Flags = Not embedded profile, Use anywhere E Dev. Attrbts = reflective, glossy E Rndrng Intnt = perceptual E Creator = lcms E - Profile ID = 0x0477fa4b E + Profile ID = 0x06017f17 E E tag 00: E sig 'desc' [0x64657363] E size 38 E type 'mluc' [0x6d6c7563] E Text: E - ne_SU: sRGB [24 bytes] E ? - - E + en_US: sRGB [24 bytes] E ? + + tests/comparators/test_icc.py:45: AssertionError ============== 2 failed, 208 passed, 38 skipped in 41.30 seconds =============== test_differences, which was failing before, now passes. Zbyszek