Skip to content

Commit ad9cad1

Browse files
Adjust logic of searching last pre-3.0 test and prepend it if no 3.0 test were found
1 parent 98f16f4 commit ad9cad1

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

firebird/qa/fbtconv.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ def clean_tests():
170170
v30: Version = parse('3.0')
171171
for t in tests:
172172
new_versions = []
173-
last: Version = parse('0.1')
173+
last_pre_30_version: Version = parse('0.1')
174+
last_pre_30 = None
174175
has_30: bool = False
175176
t.id = t.id.replace('-','_')
176177
for v in t.versions:
@@ -179,15 +180,15 @@ def clean_tests():
179180
if mv > v.firebird_version:
180181
v.firebird_version = mv
181182
#
182-
if last < v.firebird_version:
183-
last = v.firebird_version
183+
if last_pre_30_version < v.firebird_version < v30:
184+
last_pre_30_version = v.firebird_version
185+
last_pre_30 = v
184186
if v.firebird_version >= v30:
185-
has_30 = True
187+
if v.firebird_version == v30:
188+
has_30 = True
186189
new_versions.append(v)
187-
if not has_30:
188-
for v in t.versions:
189-
if v.firebird_version >= last:
190-
new_versions.append(v)
190+
if not has_30 and last_pre_30:
191+
new_versions.insert(0, last_pre_30)
191192
t.versions[:] = new_versions
192193

193194
def list_tests(root_path: Path, verbose: bool=False):

0 commit comments

Comments
 (0)