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 22:33:52 +0900 |
| commit | 4abd4382d014b3184919df981471ca33d678824e (patch) | |
| tree | 77540da141755454aaf7f26d1327427f251e1073 | |
| parent | 8c8880bb8df4931949bad6c3c71d3d912876f747 (diff) | |
| download | buildstream-4abd4382d014b3184919df981471ca33d678824e.tar.gz | |
tests/cachekey: Enhanced tests to consider local sources with multiple files.
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..1e293158c 100644 --- a/tests/cachekey/project/elements/build1.expected +++ b/tests/cachekey/project/elements/build1.expected @@ -1 +1 @@ -247eeed738527073744499406ad916b3cdef9c7dca4a2101da783e7a4d354e31
\ No newline at end of file +e8a2ab3deed52ed69987165606b5bf443998835ab3a3c0658e2ab879e9e8a1bb
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected index e47c258d3..0456f0d98 100644 --- a/tests/cachekey/project/elements/compose1.expected +++ b/tests/cachekey/project/elements/compose1.expected @@ -1 +1 @@ -197704abb7bfc136fe2567938c357043c69e0f48ce336842e7d18f9784319a5e
\ No newline at end of file +b0286f805615fc91ae73a9116c8fc883d9e1a5bb210729b6b94d8294009be3c9
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected index d7832cb36..03c27cc3b 100644 --- a/tests/cachekey/project/elements/compose2.expected +++ b/tests/cachekey/project/elements/compose2.expected @@ -1 +1 @@ -f658b0cdcb5841c16ac6372724e7ae969bbf85b084e4ffc127136c6cc374842f
\ No newline at end of file +8699f4d8a38e3fd10ffb62adecfc1b4d9f0a11af0d8f995944be85a8865b48fb
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected index 66c88a6a6..b81755566 100644 --- a/tests/cachekey/project/elements/compose3.expected +++ b/tests/cachekey/project/elements/compose3.expected @@ -1 +1 @@ -4c4109ab5e667da04104fc80d4d5d3dca38fcf0074ce7301f59485767b875ef3
\ No newline at end of file +71949ed66f8df73eaec729454d6a9bfa995d13bbded1a00f38114971b263b625
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected index 150357368..c62b226c4 100644 --- a/tests/cachekey/project/elements/compose4.expected +++ b/tests/cachekey/project/elements/compose4.expected @@ -1 +1 @@ -1197dc0edf0287d68bf3d522a0a537cce0a47be3cacbe3250061307cfabc2811
\ No newline at end of file +c19b878121593c571a10e49367e1facfcaf92429fc75f41cb1e586ae9a052654
\ No newline at end of file diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected index 4b98226ac..0be542ab7 100644 --- a/tests/cachekey/project/elements/compose5.expected +++ b/tests/cachekey/project/elements/compose5.expected @@ -1 +1 @@ -5ff99ec5fa1b16dc4222183510d07d666c50c6ba9fab82d48c52da470a26702b
\ No newline at end of file +762200c41f7071bf957aced0b81748b975486c0ad127d6d1f0c166f253c715cd
\ No newline at end of file diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected index 7759e793e..3ed617bd4 100644 --- a/tests/cachekey/project/elements/import1.expected +++ b/tests/cachekey/project/elements/import1.expected @@ -1 +1 @@ -5c5554504aaefb270ba25c501cc52af6b605865ca99ab53adb199ea101981d2b
\ No newline at end of file +8714f5eef32174d6c6eb3c3934c758c35c180153def6fabc9fe69272c9512651
\ No newline at end of file diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected index 2a4d63c10..d9b1b42e5 100644 --- a/tests/cachekey/project/elements/import2.expected +++ b/tests/cachekey/project/elements/import2.expected @@ -1 +1 @@ -c21db73188bc50d652ac39c581181c17615f05afe81e5ffacb64d5086f97da75
\ No newline at end of file +45dd16e4c48b21f78239243f6264ccb56f5ae97c1b5082301b3c1ab059ad83a7
\ No newline at end of file diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected index 75fadf0d6..623781e83 100644 --- a/tests/cachekey/project/elements/import3.expected +++ b/tests/cachekey/project/elements/import3.expected @@ -1 +1 @@ -a4921dce2013afab2020eacbc7f01e476d695aaddbc2b6b1a29af65c0a39d5b8
\ No newline at end of file +16f5ad9fc0d265a8c1014633367d6ee85ee1e6786f22d1d635e1138621ab4a4e
\ No newline at end of file diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected index a0dec66c2..de88d488f 100644 --- a/tests/cachekey/project/elements/script1.expected +++ b/tests/cachekey/project/elements/script1.expected @@ -1 +1 @@ -b282e855c3efc67c5869b4012603a869cfa3a425e06dedd98d2ceb3a02de65e3
\ No newline at end of file +766715a30c8fedb00b85fd6c9d7ae8a42948c37956d05e2360225c2f133bfb71
\ 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..3ed617bd4 100644 --- a/tests/cachekey/project/sources/local1.expected +++ b/tests/cachekey/project/sources/local1.expected @@ -1 +1 @@ -5c5554504aaefb270ba25c501cc52af6b605865ca99ab53adb199ea101981d2b
\ No newline at end of file +8714f5eef32174d6c6eb3c3934c758c35c180153def6fabc9fe69272c9512651
\ No newline at end of file diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected index f599f848e..4829282ea 100644 --- a/tests/cachekey/project/sources/local2.expected +++ b/tests/cachekey/project/sources/local2.expected @@ -1 +1 @@ -199fdb2732acb5dc7de0c50d76ff305a933352c04cde9ba2680c2eedf68b0d08
\ No newline at end of file +c9fb2fa9f97231f5e0d09aa37d579df48f638abd095832f3112f30b8e7a99683
\ No newline at end of file diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected index b5f0d9134..2c1b6a686 100644 --- a/tests/cachekey/project/target.expected +++ b/tests/cachekey/project/target.expected @@ -1 +1 @@ -e1cf51fe826c3c18e965888f79a07a1f1d48ab50a764787d36484ca102bbb8ff
\ No newline at end of file +13e34b7b3350a3f133b829269f1bc68b6ca1ea0a82806e5442607627f20cdb31
\ No newline at end of file |