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

hirl: log the test helper address #1079

Merged
merged 2 commits into from
Feb 10, 2023
Merged

hirl: log the test helper address #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ff0310
hirl: log the test helper address
bassosimone Feb 10, 2023
88c74f4
fix tests
bassosimone Feb 10, 2023
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
3 changes: 2 additions & 1 deletion internal/experiment/hirl/hirl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

const (
testName = "http_invalid_request_line"
testVersion = "0.2.0"
testVersion = "0.2.1"
timeout = 5 * time.Second
)

Expand Down Expand Up @@ -96,6 +96,7 @@ func (m Measurer) Run(ctx context.Context, args *model.ExperimentArgs) error {
if helper.Type != "legacy" {
return ErrInvalidHelperType
}
sess.Logger().Infof("using test helper: %+v", helper)
measurement.TestHelpers = map[string]interface{}{
"backend": helper.Address,
}
Expand Down
22 changes: 14 additions & 8 deletions internal/experiment/hirl/hirl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestNewExperimentMeasurer(t *testing.T) {
if measurer.ExperimentName() != "http_invalid_request_line" {
t.Fatal("unexpected name")
}
if measurer.ExperimentVersion() != "0.2.0" {
if measurer.ExperimentVersion() != "0.2.1" {
t.Fatal("unexpected version")
}
}
Expand All @@ -32,7 +32,7 @@ func TestSuccess(t *testing.T) {
measurer := hirl.NewExperimentMeasurer(hirl.Config{})
ctx := context.Background()
sess := &mockable.Session{
MockableLogger: log.Log,
MockableLogger: model.DiscardLogger,
MockableTestHelpers: map[string][]model.OOAPIService{
"tcp-echo": {{
Address: "37.218.241.93",
Expand Down Expand Up @@ -86,7 +86,7 @@ func TestCancelledContext(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
cancel()
sess := &mockable.Session{
MockableLogger: log.Log,
MockableLogger: model.DiscardLogger,
MockableTestHelpers: map[string][]model.OOAPIService{
"tcp-echo": {{
Address: "37.218.241.93",
Expand Down Expand Up @@ -197,6 +197,7 @@ func TestWithFakeMethods(t *testing.T) {
Type: "legacy",
}},
},
MockableLogger: model.DiscardLogger,
}
measurement := new(model.Measurement)
callbacks := model.NewPrinterCallbacks(log.Log)
Expand Down Expand Up @@ -263,6 +264,7 @@ func TestWithNoMethods(t *testing.T) {
Type: "legacy",
}},
},
MockableLogger: model.DiscardLogger,
}
measurement := new(model.Measurement)
callbacks := model.NewPrinterCallbacks(log.Log)
Expand Down Expand Up @@ -296,7 +298,9 @@ func TestWithNoMethods(t *testing.T) {
func TestNoHelpers(t *testing.T) {
measurer := hirl.NewExperimentMeasurer(hirl.Config{})
ctx := context.Background()
sess := &mockable.Session{}
sess := &mockable.Session{
MockableLogger: model.DiscardLogger,
}
measurement := new(model.Measurement)
callbacks := model.NewPrinterCallbacks(log.Log)
args := &model.ExperimentArgs{
Expand Down Expand Up @@ -333,6 +337,7 @@ func TestNoActualHelperInList(t *testing.T) {
MockableTestHelpers: map[string][]model.OOAPIService{
"tcp-echo": nil,
},
MockableLogger: model.DiscardLogger,
}
measurement := new(model.Measurement)
callbacks := model.NewPrinterCallbacks(log.Log)
Expand Down Expand Up @@ -373,6 +378,7 @@ func TestWrongTestHelperType(t *testing.T) {
Type: "antani",
}},
},
MockableLogger: model.DiscardLogger,
}
measurement := new(model.Measurement)
callbacks := model.NewPrinterCallbacks(log.Log)
Expand Down Expand Up @@ -405,13 +411,13 @@ func TestWrongTestHelperType(t *testing.T) {

func TestRunMethodDialFailure(t *testing.T) {
sess := &mockable.Session{
MockableLogger: log.Log,
MockableTestHelpers: map[string][]model.OOAPIService{
"tcp-echo": {{
Address: "37.218.241.93",
Type: "legacy",
}},
},
MockableLogger: model.DiscardLogger,
}
helpers, ok := sess.GetTestHelpersByName("tcp-echo")
if len(helpers) < 1 || !ok {
Expand Down Expand Up @@ -452,7 +458,7 @@ func TestRunMethodDialFailure(t *testing.T) {

func TestRunMethodSetDeadlineFailure(t *testing.T) {
sess := &mockable.Session{
MockableLogger: log.Log,
MockableLogger: model.DiscardLogger,
MockableTestHelpers: map[string][]model.OOAPIService{
"tcp-echo": {{
Address: "37.218.241.93",
Expand Down Expand Up @@ -501,7 +507,7 @@ func TestRunMethodSetDeadlineFailure(t *testing.T) {

func TestRunMethodWriteFailure(t *testing.T) {
sess := &mockable.Session{
MockableLogger: log.Log,
MockableLogger: model.DiscardLogger,
MockableTestHelpers: map[string][]model.OOAPIService{
"tcp-echo": {{
Address: "37.218.241.93",
Expand Down Expand Up @@ -550,7 +556,7 @@ func TestRunMethodWriteFailure(t *testing.T) {

func TestRunMethodReadEOFWithWrongData(t *testing.T) {
sess := &mockable.Session{
MockableLogger: log.Log,
MockableLogger: model.DiscardLogger,
MockableTestHelpers: map[string][]model.OOAPIService{
"tcp-echo": {{
Address: "37.218.241.93",
Expand Down