diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-01-10 19:52:43 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2018-01-10 20:07:46 +0900 |
| commit | 5881080f600fb012ffca8a2ba94c37ea5a7ab97b (patch) | |
| tree | d74e19d70aad86ceb7e9b965b8dedb70995a7957 | |
| parent | 39c29f2bb8bb9a7f8d2c8cade5df2c90da664400 (diff) | |
| download | buildstream-fix-local-source-cache-key-backport.tar.gz | |
tests/cachekey: Enhanced tests to consider local sources with multiple files.fix-local-source-cache-key-backport
We had a cache key instability issue with local sources generating
inconsistent cache keys due to iterating over their files in
a random order. Tests did not catch this previously due to the local
source sample only using one file to iterate over.
16 files changed, 16 insertions, 13 deletions
diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected index f7a4b6591..6fb67b641 100644 --- a/tests/cachekey/project/elements/build1.expected +++ b/tests/cachekey/project/elements/build1.expected @@ -1 +1 @@ -247eeed738527073744499406ad916b3cdef9c7dca4a2101da783e7a4d354e31
\ No newline at end of file +f8d99cf778e1195038d408fd9bbc5bfc371bd122a3515c4a028ac3a120c5e10d
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected index e47c258d3..3304b2f1f 100644 --- a/tests/cachekey/project/elements/compose1.expected +++ b/tests/cachekey/project/elements/compose1.expected @@ -1 +1 @@ -197704abb7bfc136fe2567938c357043c69e0f48ce336842e7d18f9784319a5e
\ No newline at end of file +6205142a570b9e2d14f6e7609e3a513e64919959e3836b3403e28ccf680085bb
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected index d7832cb36..866b48145 100644 --- a/tests/cachekey/project/elements/compose2.expected +++ b/tests/cachekey/project/elements/compose2.expected @@ -1 +1 @@ -f658b0cdcb5841c16ac6372724e7ae969bbf85b084e4ffc127136c6cc374842f
\ No newline at end of file +350d74a01dbb0e3abf883f7782bf3fc4b281f2a04b78b9bdb7e8227bae250fc6
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected index 66c88a6a6..58cc789fc 100644 --- a/tests/cachekey/project/elements/compose3.expected +++ b/tests/cachekey/project/elements/compose3.expected @@ -1 +1 @@ -4c4109ab5e667da04104fc80d4d5d3dca38fcf0074ce7301f59485767b875ef3
\ No newline at end of file +c98945779f2c1996eca5170fb39e8fbc19cac1155c6dc34075b5fa2e2b9959c1
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected index 150357368..2d8e8232f 100644 --- a/tests/cachekey/project/elements/compose4.expected +++ b/tests/cachekey/project/elements/compose4.expected @@ -1 +1 @@ -1197dc0edf0287d68bf3d522a0a537cce0a47be3cacbe3250061307cfabc2811
\ No newline at end of file +8294fc64704d42cbbde848de25adab996cdedaeca44569a1a1aa0e141407d300
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected index 4b98226ac..b079431b5 100644 --- a/tests/cachekey/project/elements/compose5.expected +++ b/tests/cachekey/project/elements/compose5.expected @@ -1 +1 @@ -5ff99ec5fa1b16dc4222183510d07d666c50c6ba9fab82d48c52da470a26702b
\ No newline at end of file +119ca947aa15ead148011fae696142c27c4d095083d671f606ee0575cc6e3be3
\ No newline at end of file diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected index 7759e793e..85494b00f 100644 --- a/tests/cachekey/project/elements/import1.expected +++ b/tests/cachekey/project/elements/import1.expected @@ -1 +1 @@ -5c5554504aaefb270ba25c501cc52af6b605865ca99ab53adb199ea101981d2b
\ No newline at end of file +777c0692b36c6e2bb6477ec865faa4d0dfc178ec2aaf80d2971e7ea4b3356dac
\ No newline at end of file diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected index 2a4d63c10..4be912b23 100644 --- a/tests/cachekey/project/elements/import2.expected +++ b/tests/cachekey/project/elements/import2.expected @@ -1 +1 @@ -c21db73188bc50d652ac39c581181c17615f05afe81e5ffacb64d5086f97da75
\ No newline at end of file +4e4bf7758432a91b3b6915d6036aa0d844da1e4b85a683641293b727a300d640
\ No newline at end of file diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected index 75fadf0d6..6cd507cbb 100644 --- a/tests/cachekey/project/elements/import3.expected +++ b/tests/cachekey/project/elements/import3.expected @@ -1 +1 @@ -a4921dce2013afab2020eacbc7f01e476d695aaddbc2b6b1a29af65c0a39d5b8
\ No newline at end of file +4888cdd7acf14e7409b19c977b234316da64ef3055c05da51756ab4134f8acca
\ No newline at end of file diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected index a0dec66c2..4c1129fc3 100644 --- a/tests/cachekey/project/elements/script1.expected +++ b/tests/cachekey/project/elements/script1.expected @@ -1 +1 @@ -b282e855c3efc67c5869b4012603a869cfa3a425e06dedd98d2ceb3a02de65e3
\ No newline at end of file +900e5743f000af36272cec6939b14258c5d2e8c27a0a774609f868d52668f7f1
\ No newline at end of file diff --git a/tests/cachekey/project/files/local/etc/hello.conf b/tests/cachekey/project/files/local/etc/hello.conf new file mode 100644 index 000000000..aa535b285 --- /dev/null +++ b/tests/cachekey/project/files/local/etc/hello.conf @@ -0,0 +1 @@ +message = Hello diff --git a/tests/cachekey/project/files/local/etc/ponystyle.conf b/tests/cachekey/project/files/local/etc/ponystyle.conf new file mode 100644 index 000000000..08d69ebaa --- /dev/null +++ b/tests/cachekey/project/files/local/etc/ponystyle.conf @@ -0,0 +1 @@ +pink diff --git a/tests/cachekey/project/files/local/usr/bin/goodbye b/tests/cachekey/project/files/local/usr/bin/goodbye new file mode 120000 index 000000000..b6fc4c620 --- /dev/null +++ b/tests/cachekey/project/files/local/usr/bin/goodbye @@ -0,0 +1 @@ +hello
\ No newline at end of file diff --git a/tests/cachekey/project/sources/local1.expected b/tests/cachekey/project/sources/local1.expected index 7759e793e..85494b00f 100644 --- a/tests/cachekey/project/sources/local1.expected +++ b/tests/cachekey/project/sources/local1.expected @@ -1 +1 @@ -5c5554504aaefb270ba25c501cc52af6b605865ca99ab53adb199ea101981d2b
\ No newline at end of file +777c0692b36c6e2bb6477ec865faa4d0dfc178ec2aaf80d2971e7ea4b3356dac
\ No newline at end of file diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected index f599f848e..0540e7913 100644 --- a/tests/cachekey/project/sources/local2.expected +++ b/tests/cachekey/project/sources/local2.expected @@ -1 +1 @@ -199fdb2732acb5dc7de0c50d76ff305a933352c04cde9ba2680c2eedf68b0d08
\ No newline at end of file +9767b12be7fa7cd4999eb7f75ce0c3315c2f44be565c6bf51568ef531d55f148
\ No newline at end of file diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected index b5f0d9134..b8525b185 100644 --- a/tests/cachekey/project/target.expected +++ b/tests/cachekey/project/target.expected @@ -1 +1 @@ -e1cf51fe826c3c18e965888f79a07a1f1d48ab50a764787d36484ca102bbb8ff
\ No newline at end of file +9af7a91b2d11759eb784bd161f88937619a309ad3f149f5316f19d9b1724f4f0
\ No newline at end of file |