Skip to content

Commit

Permalink
geor-integration - attempt to fix testsuite
Browse files Browse the repository at this point in the history
* defining rabbitMq properties on the console to have a chance that it
  boots up.
* adding logback configuration to the test classpath to limit the output
  being generated by testcontainers
* updating fixtures for expected organizations
  • Loading branch information
pmauduit committed Oct 3, 2023
1 parent 51c2980 commit 72de46b
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
</encoder>
</appender>

<root level="info">
<appender-ref ref="STDOUT"/>
</root>

<logger name="org.testcontainers" level="INFO"/>
<!-- The following logger can be used for containers logs since 1.18.0 -->
<logger name="tc" level="INFO"/>
<logger name="com.github.dockerjava" level="WARN"/>
<logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="OFF"/>
</configuration>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# set by GeorchestraDatabaseContainer as a System property,
# so bad it looks like console doesn't resolve ${} placeholders
# so bad it looks like console doesn't resolve ${} placeholders
#pgsqlHost=${jdbc.host}
# set by GeorchestraDatabaseContainer as a System property
#pgsqlPort=${jdbc.port}
Expand Down Expand Up @@ -184,3 +184,9 @@ AreasGroup=INSEE_DEP
# Activates or disable GDPR-related endpoints
# default: true
#gdpr.allowAccountDeletion=true


rabbitmqHost=localhost
rabbitmqUser=
rabbitmqPassword=
rabbitmqPort=5672
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
</encoder>
</appender>

<root level="info">
<appender-ref ref="STDOUT"/>
</root>

<logger name="org.testcontainers" level="INFO"/>
<!-- The following logger can be used for containers logs since 1.18.0 -->
<logger name="tc" level="INFO"/>
<logger name="com.github.dockerjava" level="WARN"/>
<logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="OFF"/>
</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"category": "Company",
"description": "Camptocamp SAS France",
"notes": "Internal CRM notes on Camptocamp",
"lastUpdated": "24166fee9b20a69a1ca402f1b84b80c77ad0fc263542d4de06ad86ec205e5555",
"lastUpdated": "2f42c3f432c75d6fc2b38b03048d3fed6f9a02bd303d5531efbcead0300c83b2",
"members": [
"testeditor"
]
Expand All @@ -22,7 +22,7 @@
"category": "Association",
"description": "Association PSC geOrchestra",
"notes": "Internal CRM notes on PSC",
"lastUpdated": "b9142a69098fecfb1b639d6a8e9ac091284a23f6cc103dc3f5ca71688e42d9c3",
"lastUpdated": "b7a295e9654cc4d3bdd8201feb1ac74dd23cc9ea2c9947f2b05b4118ac3bbe41",
"members": [
"testadmin",
"testuser"
Expand Down

0 comments on commit 72de46b

Please sign in to comment.