Skip to content

Commit

Permalink
PMM-7 fix supervisor_test after merging
Browse files Browse the repository at this point in the history
  • Loading branch information
ademidoff committed Sep 18, 2024
1 parent 9bc2a01 commit 6a7efaf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
5 changes: 2 additions & 3 deletions agent/agents/supervisor/supervisor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func TestSupervisor(t *testing.T) {
&agentv1.StateChangedRequest{AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"})
expectedList = []*agentlocal.AgentInfo{
{AgentType: type_TEST_NOOP, AgentId: "noop3", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING},
{AgentType: type_TEST_SLEEP, AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING, ListenPort: 65000, ProcessExecPath: "sleep"},
{AgentType: type_TEST_SLEEP, AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"},
}
assert.Equal(t, expectedList, s.AgentsList())

Expand Down Expand Up @@ -116,8 +116,7 @@ func TestSupervisor(t *testing.T) {
&agentv1.StateChangedRequest{AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING, ListenPort: 65000, ProcessExecPath: "sleep"},
&agentv1.StateChangedRequest{AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"},
&agentv1.StateChangedRequest{AgentId: "sleep2", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING, ListenPort: 65001, ProcessExecPath: "sleep"},
&agentv1.StateChangedRequest{AgentId: "sleep2", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65001, ProcessExecPath: "sleep"},
)
&agentv1.StateChangedRequest{AgentId: "sleep2", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65001, ProcessExecPath: "sleep"})
expectedList = []*agentlocal.AgentInfo{
{AgentType: type_TEST_NOOP, AgentId: "noop3", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING},
{AgentType: type_TEST_SLEEP, AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"},
Expand Down
8 changes: 4 additions & 4 deletions api/buf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ lint:
- PACKAGE_NO_IMPORT_CYCLE
ignore_only:
PACKAGE_VERSION_SUFFIX:
- api/common/common.proto
- api/common/metrics_resolutions.proto
- common/common.proto
- common/metrics_resolutions.proto
RPC_REQUEST_STANDARD_NAME:
- api/agent/v1/agent.proto
- agent/v1/agent.proto
RPC_RESPONSE_STANDARD_NAME:
- api/agent/v1/agent.proto
- agent/v1/agent.proto
disallow_comment_ignores: true
breaking:
use:
Expand Down
4 changes: 2 additions & 2 deletions managed/services/agents/mongodb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,8 @@ func TestMongodbExporterConfig2430(t *testing.T) {
AgentPassword: pointer.ToString("agent-password"),
}
actual, err := mongodbExporterConfig(node, mongodb, exporter, redactSecrets, pmmAgentVersion)
expected := &agentpb.SetStateRequest_AgentProcess{
Type: inventorypb.AgentType_MONGODB_EXPORTER,
expected := &agentv1.SetStateRequest_AgentProcess{
Type: inventoryv1.AgentType_AGENT_TYPE_MONGODB_EXPORTER,
TemplateLeftDelim: "{{",
TemplateRightDelim: "}}",
Args: []string{
Expand Down

0 comments on commit 6a7efaf

Please sign in to comment.