Add back 6.0 branch to bwc tests to cover backports pre-release

mfussenegger · mfussenegger · commit e5432a8974f1 · 2025-10-07T11:11:07.000+02:00
Was removed in #358
diff --git a/tests/bwc/test_recovery.py b/tests/bwc/test_recovery.py
@@ -26,7 +26,8 @@
     UpgradePath('5.8.x', '5.9.x'),
     UpgradePath('5.9.x', '5.10.x'),
     UpgradePath('5.10.x', '6.0.x'),
-    UpgradePath('6.0.x', 'latest-nightly')
+    UpgradePath('6.0.x', '6.0'),
+    UpgradePath('6.0', 'latest-nightly')
 ]
 UPGRADE_PATHS_FROM_43 = [UpgradePath('4.3.x', '4.4.x')]
 
diff --git a/tests/bwc/test_rolling_upgrade.py b/tests/bwc/test_rolling_upgrade.py
@@ -44,7 +44,8 @@
     UpgradePath('5.8.x', '5.9.x'),
     UpgradePath('5.9.x', '5.10.x'),
     UpgradePath('5.10.x', '6.0.x'),
-    UpgradePath('6.0.x', 'latest-nightly'),
+    UpgradePath('6.0.x', '6.0'),
+    UpgradePath('6.0', 'latest-nightly'),
 )
 
 
diff --git a/tests/bwc/test_upgrade.py b/tests/bwc/test_upgrade.py
@@ -59,6 +59,7 @@
         VersionDef('5.9.x', []),
         VersionDef('5.10.x', []),
         VersionDef('6.0.x', []),
+        VersionDef('6.0', []),
         VersionDef('latest-nightly', [])
     )
 )

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@`
`26`	`26`	`UpgradePath('5.8.x', '5.9.x'),`
`27`	`27`	`UpgradePath('5.9.x', '5.10.x'),`
`28`	`28`	`UpgradePath('5.10.x', '6.0.x'),`
`29`		`- UpgradePath('6.0.x', 'latest-nightly')`
	`29`	`+ UpgradePath('6.0.x', '6.0'),`
	`30`	`+ UpgradePath('6.0', 'latest-nightly')`
`30`	`31`	`]`
`31`	`32`	`UPGRADE_PATHS_FROM_43 = [UpgradePath('4.3.x', '4.4.x')]`
`32`	`33`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@`
`44`	`44`	`UpgradePath('5.8.x', '5.9.x'),`
`45`	`45`	`UpgradePath('5.9.x', '5.10.x'),`
`46`	`46`	`UpgradePath('5.10.x', '6.0.x'),`
`47`		`- UpgradePath('6.0.x', 'latest-nightly'),`
	`47`	`+ UpgradePath('6.0.x', '6.0'),`
	`48`	`+ UpgradePath('6.0', 'latest-nightly'),`
`48`	`49`	`)`
`49`	`50`
`50`	`51`