| |
@@ -229,6 +229,11 @@
|
| |
('Fedora-WorkstationOstree-ostree-x86_64-Rawhide', 'Fedora-WS-ostree-x86_64-rawh'),
|
| |
('x86_64-compose_id-20160107', 'x86_64-compose_id-20160107'),
|
| |
('x86_64-compose_id-20160107-Alpha', 'x86_64-compose_id-20160107-A'),
|
| |
+ # These test the case where one substitution is a subset
|
| |
+ # of the other, but sorts alphabetically ahead of it, to
|
| |
+ # make sure we're correctly sorting by length
|
| |
+ ('Fedora-zzzaaaaaazzz-Rawhide', 'Fedora-zzz-rawh'),
|
| |
+ ('Fedora-aaaaaa-Rawhide', 'Fedora-aaa-rawh'),
|
| |
]
|
| |
for volid, expected in all_keys:
|
| |
conf = {
|
| |
@@ -237,6 +242,8 @@
|
| |
'WorkstationOstree': 'WS',
|
| |
'Workstation': 'WS',
|
| |
'Alpha': 'A',
|
| |
+ 'zzzaaaaaazzz': 'zzz',
|
| |
+ 'aaaaaa': 'aaa',
|
| |
}
|
| |
}
|
| |
c = compose.Compose(conf, self.tmp_dir)
|
| |
adamwill
commented 6 years ago
The previous attempt - caed78e - is not really correct. It sorts
the dict item tuples according to the alphabetical sort order of
the first item of each tuple (reversed). This will always work
when both substitutions start with the same characters, as in
the case of two strings that start with the same characters but
have a different length, the shorter one sorts alphabetically
first, and we reverse that. But it is not safe if the shorter
substitution doesn't start with the same characters, as in the
case I put in the tests: we should sort 'zzzaaaaaazzz' before
'aaaaaa' (and hence apply the 'zzzaaaaaazzz' substitution to a
volume ID that contains that string and not the 'aaaaaa' one),
but the previous commit did not.
Signed-off-by: Adam Williamson awilliam@redhat.com