Skip to content

Commit

Permalink
update script
Browse files Browse the repository at this point in the history
  • Loading branch information
Yury-Fridlyand committed Sep 25, 2024
1 parent e599742 commit ac09d1e
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 93 deletions.
2 changes: 1 addition & 1 deletion csharp/tests/Integration/IntegrationTestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ internal List<uint> StartRedis(bool cluster, bool tls = false, string? name = nu
/// </summary>
internal void StopRedis(bool keepLogs, string? name = null)
{
string cmd = $"stop --prefix {name ?? "redis-cluster"} {(keepLogs ? "--keep-folder" : "")}";
string cmd = $"stop --prefix {name ?? "cluster"} {(keepLogs ? "--keep-folder" : "")}";
_ = RunClusterManager(cmd, true);
}

Expand Down
4 changes: 2 additions & 2 deletions go/integTest/glide_test_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type GlideTestSuite struct {
func (suite *GlideTestSuite) SetupSuite() {
// Stop cluster in case previous test run was interrupted or crashed and didn't stop.
// If an error occurs, we ignore it in case the servers actually were stopped before running this.
runClusterManager(suite, []string{"stop", "--prefix", "redis-cluster"}, true)
runClusterManager(suite, []string{"stop", "--prefix", "cluster"}, true)

// Delete dirs if stop failed due to https://github.com/valkey-io/valkey-glide/issues/849
err := os.RemoveAll("../../utils/clusters")
Expand Down Expand Up @@ -122,7 +122,7 @@ func TestGlideTestSuite(t *testing.T) {
}

func (suite *GlideTestSuite) TearDownSuite() {
runClusterManager(suite, []string{"stop", "--prefix", "redis-cluster", "--keep-folder"}, false)
runClusterManager(suite, []string{"stop", "--prefix", "cluster", "--keep-folder"}, false)
}

func (suite *GlideTestSuite) TearDownTest() {
Expand Down
4 changes: 2 additions & 2 deletions java/integTest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ ext {

tasks.register('stopAllAfterTests', Exec) {
workingDir "${project.rootDir}/../utils"
commandLine 'python3', 'cluster_manager.py', 'stop', '--prefix', 'redis-cluster', '--keep-folder'
commandLine 'python3', 'cluster_manager.py', 'stop', '--prefix', 'cluster', '--keep-folder'
}

// We need to call for stop before and after the test, but gradle doesn't support executing a task
// twice. So there are two identical tasks with different names.
// We need to call for stop in case if previous test run was interrupted/crashed and didn't stop.
tasks.register('stopAllBeforeTests', Exec) {
workingDir "${project.rootDir}/../utils"
commandLine 'python3', 'cluster_manager.py', 'stop', '--prefix', 'redis-cluster'
commandLine 'python3', 'cluster_manager.py', 'stop', '--prefix', 'cluster'
ignoreExitValue true // ignore fail if servers are stopped before
}

Expand Down
Loading

0 comments on commit ac09d1e

Please sign in to comment.