Skip to content

Commit

Permalink
Merge pull request #434 from azeey/12_to_main
Browse files Browse the repository at this point in the history
Merge gz-transport12 ➡️  main
  • Loading branch information
iche033 authored Aug 30, 2023
2 parents c507108 + 0f6392a commit b2877bc
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Add ticket to inbox
uses: technote-space/create-project-card-action@v1
uses: actions/[email protected]
with:
PROJECT: Core development
COLUMN: Inbox
GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }}
CHECK_ORG_PROJECT: true
project-url: https://github.com/orgs/gazebosim/projects/7
github-token: ${{ secrets.TRIAGE_TOKEN }}

2 changes: 1 addition & 1 deletion parameters/src/Client_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ TEST_F(ParametersClientTest, Parameter)
{
std::unique_ptr<google::protobuf::Message> msg;
EXPECT_TRUE(client.Parameter("parameter2", msg));
EXPECT_TRUE(msg);
ASSERT_NE(nullptr, msg);
auto downcastedMsg = dynamic_cast<msgs::StringMsg *>(msg.get());
EXPECT_EQ(downcastedMsg->data(), "");
}
Expand Down
12 changes: 9 additions & 3 deletions parameters/src/cmd/ParamCommandAPI_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,19 @@ TEST_F(ParametersClientTest, cmdParameterGet)
cmdParameterGet("", "parameter1");
auto output = coutCapture.str();
EXPECT_NE(std::string::npos, output.find("gz_msgs.Boolean"));
EXPECT_EQ(cerrCapture.str(), "");
// TODO(azeey) Uncomment after
// https://github.com/gazebosim/gz-transport/issues/435 is resolved
// EXPECT_EQ(cerrCapture.str(), "");
}
{
CaptureCoutScoped coutCapture;
CaptureCerrScoped cerrCapture;
cmdParameterGet("", "parameter2");
auto output = coutCapture.str();
EXPECT_NE(std::string::npos, output.find("gz_msgs.StringMsg"));
EXPECT_EQ(cerrCapture.str(), "");
// TODO(azeey) Uncomment after
// https://github.com/gazebosim/gz-transport/issues/435 is resolved
// EXPECT_EQ(cerrCapture.str(), "");
}
{
CaptureCoutScoped coutCapture;
Expand All @@ -118,7 +122,9 @@ TEST_F(ParametersClientTest, cmdParameterGet)
auto output = coutCapture.str();
EXPECT_NE(std::string::npos, output.find("gz_msgs.StringMsg"));
EXPECT_NE(std::string::npos, output.find("bsd"));
EXPECT_EQ(cerrCapture.str(), "");
// TODO(azeey) Uncomment after
// https://github.com/gazebosim/gz-transport/issues/435 is resolved
// EXPECT_EQ(cerrCapture.str(), "");
}
{
CaptureCerrScoped cerrCapture;
Expand Down

0 comments on commit b2877bc

Please sign in to comment.