From 4327c00e05b30086cba3b4e3314d3f4565f1bce2 Mon Sep 17 00:00:00 2001 From: Guilherme Andrade Del Cantoni Date: Fri, 14 Apr 2023 21:17:36 -0300 Subject: [PATCH] =?UTF-8?q?test:=20corre=C3=A7=C3=A3o=20de=20configura?= =?UTF-8?q?=C3=A7=C3=B5es=20de=20teste=20para=20sei3=20e=20sei4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests_sei3/funcional/docker-compose.yml | 8 +- tests_sei3/funcional/phpunit.xml | 133 +++++++++++++---------- tests_sei4/funcional/docker-compose.yml | 14 +-- tests_sei4/funcional/phpunit.xml | 1 - tests_super/funcional/docker-compose.yml | 2 +- 5 files changed, 82 insertions(+), 76 deletions(-) diff --git a/tests_sei3/funcional/docker-compose.yml b/tests_sei3/funcional/docker-compose.yml index 086af0efb..746741852 100644 --- a/tests_sei3/funcional/docker-compose.yml +++ b/tests_sei3/funcional/docker-compose.yml @@ -9,12 +9,12 @@ services: - "1080:1080" org1-memcached: - image: processoeletronico/vagrant_super4_memcached:${ENVIRONMENT_VERSION} + image: guilhermeadc/sei3_memcached:7.2 ports: - "11211" org2-memcached: - image: processoeletronico/vagrant_super4_memcached:${ENVIRONMENT_VERSION} + image: guilhermeadc/sei3_memcached:7.2 ports: - "11211" @@ -73,8 +73,8 @@ services: extra_hosts: - "host.docker.internal:host-gateway" links: - - org1-database:${ORG1_DATABASE_HOST} - - org2-database:${ORG1_DATABASE_HOST} + - org1-database:${ORG1_DATABASE_NAME} + - org2-database:${ORG1_DATABASE_NAME} - selenium:selenium command: "true" diff --git a/tests_sei3/funcional/phpunit.xml b/tests_sei3/funcional/phpunit.xml index 687a77008..16bac3556 100755 --- a/tests_sei3/funcional/phpunit.xml +++ b/tests_sei3/funcional/phpunit.xml @@ -1,30 +1,30 @@ - - + cacheResult="false"> + - - - - - + + + + + - - - + + + - + - - + + @@ -32,30 +32,37 @@ - - - + + + - + - + - + - - - - - - + + + + + + - + - + @@ -63,29 +70,36 @@ - - - + + + - - + + - - - - - - - - - + + + + + + + + + - + - + @@ -93,17 +107,20 @@ - - + + - + - - - - - + + + + + @@ -111,4 +128,4 @@ tests - + \ No newline at end of file diff --git a/tests_sei4/funcional/docker-compose.yml b/tests_sei4/funcional/docker-compose.yml index 601a96dc9..ce5f4cf31 100644 --- a/tests_sei4/funcional/docker-compose.yml +++ b/tests_sei4/funcional/docker-compose.yml @@ -10,12 +10,12 @@ services: - "1080:1080" org1-memcached: - image: processoeletronico/vagrant_super4_memcached:${ENVIRONMENT_VERSION} + image: processoeletronico/vagrant_sei4_memcached:${ENVIRONMENT_VERSION} ports: - "11211" org2-memcached: - image: processoeletronico/vagrant_super4_memcached:${ENVIRONMENT_VERSION} + image: processoeletronico/vagrant_sei4_memcached:${ENVIRONMENT_VERSION} ports: - "11211" @@ -156,15 +156,10 @@ services: - SEI_DATABASE_NAME=${SEI_DATABASE_NAME} - SEI_DATABASE_USER=${SEI_DATABASE_USER} - SEI_DATABASE_PASSWORD=${SEI_DATABASE_PASSWORD} - - SEI_DATABASE_USER_SCRIPT=${SEI_DATABASE_USER_SCRIPT} - - SEI_DATABASE_PASSWORD_SCRIPT=${SEI_DATABASE_PASSWORD_SCRIPT} - - SIP_CHAVE_ACESSO=${ORG1_APP_SIP_CHAVE_ACESSO} - SIP_DATABASE_NAME=${SIP_DATABASE_NAME} - SIP_DATABASE_USER=${SIP_DATABASE_USER} - SIP_DATABASE_PASSWORD=${SIP_DATABASE_PASSWORD} - - SIP_DATABASE_USER_SCRIPT=${SIP_DATABASE_USER_SCRIPT} - - SIP_DATABASE_PASSWORD_SCRIPT=${SIP_DATABASE_PASSWORD_SCRIPT} extra_hosts: - "host.docker.internal:host-gateway" @@ -221,15 +216,10 @@ services: - SEI_DATABASE_NAME=${SEI_DATABASE_NAME} - SEI_DATABASE_USER=${SEI_DATABASE_USER} - SEI_DATABASE_PASSWORD=${SEI_DATABASE_PASSWORD} - - SEI_DATABASE_USER_SCRIPT=${SEI_DATABASE_USER_SCRIPT} - - SEI_DATABASE_PASSWORD_SCRIPT=${SEI_DATABASE_PASSWORD_SCRIPT} - - SIP_CHAVE_ACESSO=${ORG2_APP_SIP_CHAVE_ACESSO} - SIP_DATABASE_NAME=${SIP_DATABASE_NAME} - SIP_DATABASE_USER=${SIP_DATABASE_USER} - SIP_DATABASE_PASSWORD=${SIP_DATABASE_PASSWORD} - - SIP_DATABASE_USER_SCRIPT=${SIP_DATABASE_USER_SCRIPT} - - SIP_DATABASE_PASSWORD_SCRIPT=${SIP_DATABASE_PASSWORD_SCRIPT} extra_hosts: - "host.docker.internal:host-gateway" diff --git a/tests_sei4/funcional/phpunit.xml b/tests_sei4/funcional/phpunit.xml index 086d707ea..68c8de379 100755 --- a/tests_sei4/funcional/phpunit.xml +++ b/tests_sei4/funcional/phpunit.xml @@ -6,7 +6,6 @@ colors="true" verbose="true" cacheResult="false" - executionOrder="no-depends" > diff --git a/tests_super/funcional/docker-compose.yml b/tests_super/funcional/docker-compose.yml index c0e5ff5e7..606e83411 100644 --- a/tests_super/funcional/docker-compose.yml +++ b/tests_super/funcional/docker-compose.yml @@ -75,7 +75,7 @@ services: - "host.docker.internal:host-gateway" links: - org1-database:${ORG1_DATABASE_HOST} - - org2-database:${ORG1_DATABASE_HOST} + - org2-database:${ORG2_DATABASE_HOST} - selenium:selenium command: "true"