Skip to content

Commit d5a9574

Browse files
committed
disable upgrade tests to 3.4 until 3.4 is available on hub.docker.com
1 parent bec0925 commit d5a9574

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

tests/test_util.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@ func waitUntilVersionUp(cli driver.Client, predicate func(driver.VersionInfo) er
238238
}
239239

240240
// creates predicate to be used in waitUntilVersionUp
241-
func createEqualVersionsPredicate(info driver.Version) func(driver.VersionInfo) error {
241+
func createEqualVersionsPredicate(version driver.Version) func(driver.VersionInfo) error {
242242
return func(infoFromServer driver.VersionInfo) error {
243-
if (info.CompareTo(infoFromServer.Version)) != 0 {
244-
return maskAny(fmt.Errorf("given version %v and version from server %v do not match", info, infoFromServer.Version))
243+
if version.CompareTo(infoFromServer.Version) != 0 {
244+
return maskAny(fmt.Errorf("given version %v and version from server %v do not match", version, infoFromServer.Version))
245245
}
246246
return nil
247247
}

tests/upgrade_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,30 @@ func TestUpgradeSingleMMFiles32to33(t *testing.T) {
3737
upgradeSubTest(t, api.DeploymentModeSingle, api.StorageEngineMMFiles, "3.2.12", "3.3.4")
3838
}
3939

40-
// test upgrade single server rocksdb 3.3 -> 3.4
41-
func TestUpgradeSingleRocksDB33to34(t *testing.T) {
42-
upgradeSubTest(t, api.DeploymentModeSingle, api.StorageEngineRocksDB, "3.3.4", "3.4.0")
43-
}
40+
// // test upgrade single server rocksdb 3.3 -> 3.4
41+
// func TestUpgradeSingleRocksDB33to34(t *testing.T) {
42+
// upgradeSubTest(t, api.DeploymentModeSingle, api.StorageEngineRocksDB, "3.3.4", "3.4.0")
43+
// }
4444

4545
// test upgrade resilient single server rocksdb 3.2 -> 3.3
4646
func TestUpgradeResilientSingleRocksDB32to33(t *testing.T) {
4747
upgradeSubTest(t, api.DeploymentModeResilientSingle, api.StorageEngineRocksDB, "3.2.12", "3.3.4")
4848
}
4949

50-
// test upgrade resilient single server mmfiles 3.3 -> 3.4
51-
func TestUpgradeResilientSingleMMFiles33to34(t *testing.T) {
52-
upgradeSubTest(t, api.DeploymentModeResilientSingle, api.StorageEngineMMFiles, "3.3.0", "3.4.0")
53-
}
50+
// // test upgrade resilient single server mmfiles 3.3 -> 3.4
51+
// func TestUpgradeResilientSingleMMFiles33to34(t *testing.T) {
52+
// upgradeSubTest(t, api.DeploymentModeResilientSingle, api.StorageEngineMMFiles, "3.3.0", "3.4.0")
53+
// }
5454

5555
// test upgrade cluster rocksdb 3.2 -> 3.3
5656
func TestUpgradeClusterRocksDB32to33(t *testing.T) {
5757
upgradeSubTest(t, api.DeploymentModeCluster, api.StorageEngineRocksDB, "3.2.12", "3.3.4")
5858
}
5959

60-
// test upgrade cluster mmfiles 3.3 -> 3.4
61-
func TestUpgradeClusterMMFiles33to34(t *testing.T) {
62-
upgradeSubTest(t, api.DeploymentModeCluster, api.StorageEngineRocksDB, "3.3.4", "3.4.0")
63-
}
60+
// // test upgrade cluster mmfiles 3.3 -> 3.4
61+
// func TestUpgradeClusterMMFiles33to34(t *testing.T) {
62+
// upgradeSubTest(t, api.DeploymentModeCluster, api.StorageEngineRocksDB, "3.3.4", "3.4.0")
63+
// }
6464

6565
func upgradeSubTest(t *testing.T, mode api.DeploymentMode, engine api.StorageEngine, fromVersion, toVersion string) error {
6666
// check environment

0 commit comments

Comments
 (0)