Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update cluster_manager script #2353

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update cluster_manager script #2353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion csharp/tests/Integration/IntegrationTestBase.cs
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading