From 333627b1d4a40448c31aed87382bc33bbc2ffcc2 Mon Sep 17 00:00:00 2001 From: samparent97 Date: Thu, 10 Oct 2024 10:38:44 -0400 Subject: [PATCH] Working build --- cli/cli_model.go | 2 +- cmd/clidispatchertest/main.go | 13 ++++++------- tagtunnel/client/resultprocessor.go | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cli/cli_model.go b/cli/cli_model.go index bdd3acb8..86f3acc2 100644 --- a/cli/cli_model.go +++ b/cli/cli_model.go @@ -369,7 +369,7 @@ func (c *cliModel) currentRunningTestView() string { s += fmt.Sprintf("%s currently running...\n", state.Name()) } - s += helpStyle(fmt.Sprintf("\nCurrent test running: %s\n", "Unknown name for now")) + s += helpStyle(fmt.Sprintf("\nCurrent test running: %s\n", c.currentRunningTestId.String())) s += helpStyle(fmt.Sprintf("\nTest_ID: %s\n", c.currentRunningTestId.String())) s += helpStyle(fmt.Sprintf("\nQueue length: %d\n", c.statusSignal.QueueLength)) diff --git a/cmd/clidispatchertest/main.go b/cmd/clidispatchertest/main.go index 08bffaee..98e8bcc8 100644 --- a/cmd/clidispatchertest/main.go +++ b/cmd/clidispatchertest/main.go @@ -7,7 +7,7 @@ import ( "github.com/macformula/hil/cli" "github.com/macformula/hil/flow" "github.com/macformula/hil/orchestrator" - "github.com/macformula/hil/results/client" + "github.com/macformula/hil/results" "github.com/macformula/hil/test" "github.com/pkg/errors" "go.uber.org/zap" @@ -16,8 +16,10 @@ import ( const ( _loggerName = "main.log" _resultProcessorAddr = "localhost:31763" - _configPath = "./config/hil-config/config.yaml" _resultServerPath = "./results/server/main.py" + _tagsPath = "./results/tags.yaml" + _historicTestsPath = "./results/historic_tests.yaml" + _reportsDir = "./results/reports" ) func main() { @@ -29,11 +31,8 @@ func main() { } defer logger.Sync() - resultProcessor := results.NewResultProcessor(logger, - _resultProcessorAddr, - results.WithPushReportsToGithub(), - results.WithServerAutoStart(_configPath, _resultServerPath), - ) + resultProcessor := results.NewResultAccumulator(logger, + _tagsPath, _historicTestsPath, _reportsDir, results.NewHtmlReportGenerator()) sequencer := flow.NewSequencer(resultProcessor, logger) cliDispatcher := cli.NewCliDispatcher(test.Sequences, logger) simpleDispatcher := test.NewSimpleDispatcher(logger, 5*time.Second, 10*time.Second) diff --git a/tagtunnel/client/resultprocessor.go b/tagtunnel/client/resultprocessor.go index 0614e855..521d907b 100644 --- a/tagtunnel/client/resultprocessor.go +++ b/tagtunnel/client/resultprocessor.go @@ -9,7 +9,7 @@ import ( "time" "github.com/google/uuid" - proto "github.com/macformula/hil/pyresults/client/generated" + proto "github.com/macformula/hil/tagtunnel/client/generated" "github.com/pkg/errors" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure"