Commit 83d032b9 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Aumenta tiempo de espera en tests

See merge request redmic-project/server/tasks!2
parents 371c75bd a75775e1

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ maven-build: 
    AWS_ACCESS_KEY: ${DEV_AWS_ACCESS_KEY}

    AWS_SECRET_KEY: ${DEV_AWS_SECRET_KEY}

    ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}

  tags:

    - oagdev

  only:

    - branches

  cache:

src/main/resources/application-prod.properties

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ spring.kafka.properties.schema.registry.url=http://schema-registry:8081 
spring.datasource.jdbc-url=jdbc:postgresql://db:5432/redmic



# DATASOURCE Jobs

jobs.datasource.schema=job

jobs.datasource.name=redmic

jobs.datasource.jdbc-url=jdbc:postgresql://db:5432/redmic?currentSchema=job

src/main/resources/application.properties

+5 −3
Original line number Diff line number Diff line
@@ -40,12 +40,14 @@ spring.datasource.jdbc-url=${spring.datasource.url} 
spring.datasource.initialization-mode=never



# DATASOURCE Jobs

#jobs.datasource.schema=job

#jobs.datasource.name=${jobs.datasource.name}

jobs.datasource.driver-class-name=org.postgresql.Driver

jobs.datasource.initialization-mode=never

jobs.datasource.driverClassName=${spring.datasource.driverClassName}

jobs.datasource.schema=job

jobs.datasource.name=job

jobs.datasource.username=username

jobs.datasource.password=password

jobs.datasource.jdbc-url=${jobs.datasource.url}

jobs.datasource.driver-class-name=org.postgresql.Driver



spring.batch.initialize-schema=never

src/test/java/es/redmic/test/tasks/integration/ingest/common/IngestBaseTest.java

+3 −3
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public abstract class IngestBaseTest extends IntegrationTestBase { 
		sender.send(getRunTopic(), payload);



		// Recibe tarea registrada

		MessageWrapper msg = (MessageWrapper) blockingQueue.poll(10, TimeUnit.SECONDS);

		MessageWrapper msg = (MessageWrapper) blockingQueue.poll(30, TimeUnit.SECONDS);

		assertNotNull(msg);

		taskId = msg.getActionId();

		assertEquals(msg.getUserId(), USER_ID);
@@ -75,7 +75,7 @@ public abstract class IngestBaseTest extends IntegrationTestBase { 
		assertEquals(registeredTaskDTO.getStatus().toString(), TaskStatus.Constants.REGISTERED);



		// Recibe tarea arrancada

		msg = (MessageWrapper) blockingQueue.poll(10, TimeUnit.SECONDS);

		msg = (MessageWrapper) blockingQueue.poll(30, TimeUnit.SECONDS);

		assertNotNull(msg);

		assertEquals(msg.getUserId(), USER_ID);
@@ -86,7 +86,7 @@ public abstract class IngestBaseTest extends IntegrationTestBase { 
		assertEquals(startedTaskDTO.getStatus().toString(), TaskStatus.Constants.STARTED);



		// Recibe petición de matching

		msg = (MessageWrapper) blockingQueue.poll(20, TimeUnit.SECONDS);

		msg = (MessageWrapper) blockingQueue.poll(30, TimeUnit.SECONDS);

		assertNotNull(msg);

		assertEquals(msg.getUserId(), USER_ID);

src/test/java/es/redmic/test/tasks/integration/report/common/ReportBaseTest.java

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ public abstract class ReportBaseTest extends IntegrationTestBase { 
		sender.send(getRunTopic(), payload);



		// Recibe tarea registrada

		MessageWrapper msg = (MessageWrapper) blockingQueue.poll(50, TimeUnit.SECONDS);

		MessageWrapper msg = (MessageWrapper) blockingQueue.poll(60, TimeUnit.SECONDS);

		assertNotNull(msg);

		taskId = msg.getActionId();

		assertEquals(msg.getUserId(), USER_ID);