fix: Increment tests execution time limit (#10)

* chore: Rename local tests execution directory * refactor: Create src folder * fix: Increment tests execution timeout to one minute
upb-code-labs · Jan 6, 2024 · c164193 · c164193
1 parent c682c5f
commit c164193
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@
 tmp
 
 # Tests execution folder
-tests_exec_dir/
+tests-execution-directory/
diff --git a/docs/contributing.md b/docs/contributing.md
@@ -55,7 +55,7 @@ air
 
 This will start the tests micro-service and will watch for changes in the source code and restart the service automatically.
 
-Additionally, you may want to generate a `.air.toml` file and add the `tests_exec_dir/` directory to the `exclude_dir` list in order to avoid restarting the service when the tests are executed, to do this, run the following command or refer to the [Air documentation](https://github.com/cosmtrek/air)
+Additionally, you may want to generate a `.air.toml` file and add the `tests-execution-directory/` directory to the `exclude_dir` list in order to avoid restarting the service when the tests are executed, to do this, run the following command or refer to the [Air documentation](https://github.com/cosmtrek/air)
 
 ```bash
 air init

diff --git a/main.go b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/upb-code-labs/tests-microservice/infrastructure/rabbitmq"
+	"github.com/upb-code-labs/tests-microservice/src/infrastructure/rabbitmq"
 )
 
 func main() {

diff --git a/application/submissions-use-cases.go → src/application/submissions-use-cases.go b/application/submissions-use-cases.go → src/application/submissions-use-cases.go
@@ -1,11 +1,11 @@
 package application
 
 import (
-	"github.com/upb-code-labs/tests-microservice/domain/definitions"
-	"github.com/upb-code-labs/tests-microservice/domain/dtos"
-	"github.com/upb-code-labs/tests-microservice/domain/entities"
-	"github.com/upb-code-labs/tests-microservice/infrastructure/static_files"
-	"github.com/upb-code-labs/tests-microservice/utils"
+	"github.com/upb-code-labs/tests-microservice/src/domain/definitions"
+	"github.com/upb-code-labs/tests-microservice/src/domain/dtos"
+	"github.com/upb-code-labs/tests-microservice/src/domain/entities"
+	"github.com/upb-code-labs/tests-microservice/src/infrastructure/static_files"
+	"github.com/upb-code-labs/tests-microservice/src/utils"
 )
 
 type SubmissionsUseCases struct{}

diff --git a/domain/definitions/archives_manager.go → src/domain/definitions/archives_manager.go b/domain/definitions/archives_manager.go → src/domain/definitions/archives_manager.go
diff --git a/domain/definitions/language-tests-runner.go → ...main/definitions/language-tests-runner.go b/domain/definitions/language-tests-runner.go → ...main/definitions/language-tests-runner.go
@@ -1,7 +1,7 @@
 package definitions
 
 import (
-	"github.com/upb-code-labs/tests-microservice/domain/dtos"
+	"github.com/upb-code-labs/tests-microservice/src/domain/dtos"
 )
 
 type LanguageTestsRunner interface {

diff --git a/...ubmission-status-updates-queue-manager.go → ...ubmission-status-updates-queue-manager.go b/...ubmission-status-updates-queue-manager.go → ...ubmission-status-updates-queue-manager.go
@@ -1,6 +1,6 @@
 package definitions
 
-import "github.com/upb-code-labs/tests-microservice/domain/dtos"
+import "github.com/upb-code-labs/tests-microservice/src/domain/dtos"
 
 type SubmissionStatusUpdatesQueueManager interface {
 	QueueUpdate(updateDTO *dtos.SubmissionStatusUpdateDTO) error

diff --git a/domain/dtos/dtos.go → src/domain/dtos/dtos.go b/domain/dtos/dtos.go → src/domain/dtos/dtos.go
diff --git a/domain/entities/entities.go → src/domain/entities/entities.go b/domain/entities/entities.go → src/domain/entities/entities.go
diff --git a/infrastructure/environment.go → src/infrastructure/environment.go b/infrastructure/environment.go → src/infrastructure/environment.go
@@ -5,7 +5,7 @@ import "github.com/kelseyhightower/envconfig"
 type Environment struct {
 	RabbitMQConnectionString       string `split_words:"true" default:"amqp://rabbitmq:rabbitmq@localhost:5672/"`
 	StaticFilesMicroserviceAddress string `split_words:"true" default:"http://localhost:8081"`
-	TestsExecutionDirectory        string `split_words:"true" default:"./tests_exec_dir"`
+	TestsExecutionDirectory        string `split_words:"true" default:"./tests-execution-directory"`
 }
 
 var env *Environment

diff --git a/...cture/implementations/archives_manager.go → ...cture/implementations/archives_manager.go b/...cture/implementations/archives_manager.go → ...cture/implementations/archives_manager.go
diff --git a/...ture/implementations/java-tests-runner.go → ...ture/implementations/java-tests-runner.go b/...ture/implementations/java-tests-runner.go → ...ture/implementations/java-tests-runner.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/upb-code-labs/tests-microservice/domain/dtos"
-	"github.com/upb-code-labs/tests-microservice/infrastructure"
+	"github.com/upb-code-labs/tests-microservice/src/domain/dtos"
+	"github.com/upb-code-labs/tests-microservice/src/infrastructure"
 )
 
 type JavaTestsRunner struct{}
@@ -180,7 +180,7 @@ func (javaTestsRunner *JavaTestsRunner) deleteArchives(submissionUUID string) er
 }
 
 func (javaTestsRunner *JavaTestsRunner) RunTests(submissionUUID string) (dto *dtos.TestResultDTO, err error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
 	defer cancel()
 
 	// Delete the submission directory at the end
@@ -195,7 +195,7 @@ func (javaTestsRunner *JavaTestsRunner) RunTests(submissionUUID string) (dto *dt
 
 	// Prepare the command
 	testAndBuildCommand := fmt.Sprintf(
-		"cd %s && mvn clean test",
+		"cd %s && timeout 1m mvn clean test",
 		submissionPath,
 	)
 

diff --git a/infrastructure/rabbitmq/connection.go → src/infrastructure/rabbitmq/connection.go b/infrastructure/rabbitmq/connection.go → src/infrastructure/rabbitmq/connection.go
@@ -4,7 +4,7 @@ import (
 	"log"
 
 	amqp "github.com/rabbitmq/amqp091-go"
-	"github.com/upb-code-labs/tests-microservice/infrastructure"
+	"github.com/upb-code-labs/tests-microservice/src/infrastructure"
 )
 
 var rabbitMQChannel *amqp.Channel

diff --git a/infrastructure/rabbitmq/submission-queue.go → ...frastructure/rabbitmq/submission-queue.go b/infrastructure/rabbitmq/submission-queue.go → ...frastructure/rabbitmq/submission-queue.go
@@ -5,10 +5,10 @@ import (
 	"log"
 
 	amqp "github.com/rabbitmq/amqp091-go"
-	"github.com/upb-code-labs/tests-microservice/application"
-	"github.com/upb-code-labs/tests-microservice/domain/dtos"
-	"github.com/upb-code-labs/tests-microservice/domain/entities"
-	"github.com/upb-code-labs/tests-microservice/utils"
+	"github.com/upb-code-labs/tests-microservice/src/application"
+	"github.com/upb-code-labs/tests-microservice/src/domain/dtos"
+	"github.com/upb-code-labs/tests-microservice/src/domain/entities"
+	"github.com/upb-code-labs/tests-microservice/src/utils"
 )
 
 type SubmissionQueueMgr struct {
@@ -131,6 +131,9 @@ func (manager *SubmissionQueueMgr) processSubmission(msg amqp.Delivery) {
 		return
 	}
 
+	// Log message to console
+	log.Println("[RabbitMQ]: Received submission status update", submissionWork.SubmissionUUID)
+
 	// Send submission status update
 	statusDTO := &dtos.SubmissionStatusUpdateDTO{
 		SubmissionUUID:   submissionWork.SubmissionUUID,

diff --git a/...bbitmq/submission-status-updates-queue.go → ...bbitmq/submission-status-updates-queue.go b/...bbitmq/submission-status-updates-queue.go → ...bbitmq/submission-status-updates-queue.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	amqp "github.com/rabbitmq/amqp091-go"
-	"github.com/upb-code-labs/tests-microservice/domain/dtos"
+	"github.com/upb-code-labs/tests-microservice/src/domain/dtos"
 )
 
 type SubmissionStatusUpdatesQueueMgr struct {

diff --git a/infrastructure/static_files/handler.go → src/infrastructure/static_files/handler.go b/infrastructure/static_files/handler.go → src/infrastructure/static_files/handler.go
@@ -8,8 +8,8 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/upb-code-labs/tests-microservice/domain/dtos"
-	"github.com/upb-code-labs/tests-microservice/infrastructure"
+	"github.com/upb-code-labs/tests-microservice/src/domain/dtos"
+	"github.com/upb-code-labs/tests-microservice/src/infrastructure"
 )
 
 type StaticFilesManager struct{}

diff --git a/utils/utils.go → src/utils/utils.go b/utils/utils.go → src/utils/utils.go
@@ -3,9 +3,9 @@ package utils
 import (
 	"errors"
 
-	"github.com/upb-code-labs/tests-microservice/domain/definitions"
-	"github.com/upb-code-labs/tests-microservice/domain/dtos"
-	"github.com/upb-code-labs/tests-microservice/infrastructure/implementations"
+	"github.com/upb-code-labs/tests-microservice/src/domain/definitions"
+	"github.com/upb-code-labs/tests-microservice/src/domain/dtos"
+	"github.com/upb-code-labs/tests-microservice/src/infrastructure/implementations"
 )
 
 func GetTestRunnerByLanguageUUID(languageUUID string) (runner definitions.LanguageTestsRunner, err error) {

diff --git a/tests_exec_dir/.gitkeep → tests-execution-directory/.gitkeep b/tests_exec_dir/.gitkeep → tests-execution-directory/.gitkeep