Skip to content

Commit 124f9e2

Browse files
Migrate the forgotten unused AddClusterIT and basic_reaper_functionality.feature into BasicSteps and integration_reaper_functionality.feature
- Migrate scenarios from basic_reaper_functionality.feature into integration_reaper_functionality.feature - Remove Incremental/NoIncremental class variations where they are not used. - Remove `@full` annotation, as only presence @incremental is ever checked. - Small fix to RepairScheduleService.isConflictingSchedules(..) - Remove failsafe plugin from pom as it's not used. – reduce log noise in integration tests – consistent ccm datacenter names in CI, and correctly configured DcAwareLoadBalancing policy (localDC is always 'dc1') – in BasicSteps assert that responses are only empty on against 2xx responses – in ReaperTestJettyRunner ignore interruption exceptions during test shutdown ref: https://github.com/thelastpickle/cassandra-reaper/pull/495/files
1 parent efc32b4 commit 124f9e2

17 files changed

+224
-379
lines changed

.circleci/config.yml

-3
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ aliases:
107107
MAVEN_OPTS="-Xmx1g" mvn install -DskipTests
108108
sh -c '$JOB_COMMAND'
109109
110-
#TODO
111-
#mvn surefire:test -DsurefireArgLine="-Xmx1g" -Dtest=ReaperCassandraIncrementalIT -Dgrim.reaper.min=2 -Dgrim.reaper.max=4
112-
113110
- store_test_results:
114111
path: src/server/target/surefire-reports
115112

src/ci/install.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ case "${TEST_TYPE}" in
1717
echo "cassandra readwrite" >> /usr/lib/jvm/java-8-oracle/jre/lib/management/jmxremote.access
1818
cat /usr/lib/jvm/java-8-oracle/jre/lib/management/jmxremote.access
1919
ccm create test -v $CASSANDRA_VERSION > /dev/null
20-
ccm populate --vnodes -n 2 > /dev/null
20+
# use "2:0" to ensure the first datacenter name is "dc1" instead of "datacenter1", so to be compatible with CircleCI tests
21+
ccm populate --vnodes -n 2:0 > /dev/null
2122
sed -i 's/etc\/cassandra\/jmxremote.password/home\/travis\/.local\/jmxremote.password/' /home/travis/.ccm/test/node1/conf/cassandra-env.sh
2223
sed -i 's/etc\/cassandra\/jmxremote.password/home\/travis\/.local\/jmxremote.password/' /home/travis/.ccm/test/node2/conf/cassandra-env.sh
2324
sed -i 's/#MAX_HEAP_SIZE="4G"/MAX_HEAP_SIZE="192m"/' /home/travis/.ccm/test/node1/conf/cassandra-env.sh

src/server/pom.xml

-23
Original file line numberDiff line numberDiff line change
@@ -311,29 +311,6 @@
311311
</execution>
312312
</executions>
313313
</plugin>
314-
<plugin>
315-
<groupId>org.apache.maven.plugins</groupId>
316-
<artifactId>maven-failsafe-plugin</artifactId>
317-
<version>2.21.0</version>
318-
<executions>
319-
<execution>
320-
<id>integration-tests</id>
321-
<goals>
322-
<goal>integration-test</goal>
323-
<goal>verify</goal>
324-
</goals>
325-
<configuration>
326-
<skipTests>true</skipTests>
327-
<argLine>${failsafeArgLine}</argLine>
328-
<failIfNoTests>false</failIfNoTests>
329-
<includes>
330-
<include>**/AddClusterIT.java</include>
331-
<include>**/ReaperIT.java</include>
332-
</includes>
333-
</configuration>
334-
</execution>
335-
</executions>
336-
</plugin>
337314
<plugin>
338315
<groupId>org.apache.maven.plugins</groupId>
339316
<artifactId>maven-jar-plugin</artifactId>

src/server/src/test/java/io/cassandrareaper/acceptance/AddClusterIT.java

-27
This file was deleted.

0 commit comments

Comments
 (0)