Skip to content

Commit

Permalink
fix cassandra tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Pollack committed Oct 25, 2024
1 parent d9a5640 commit 3f85f79
Show file tree
Hide file tree
Showing 9 changed files with 127 additions and 96 deletions.
9 changes: 9 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,15 @@
<version>${maven-surefire-plugin.version}</version>
<configuration>
<argLine>${surefireArgLine}</argLine>

<useFile>false</useFile>
<trimStackTrace>false</trimStackTrace>

<!-- Show test timing information -->
<reportFormat>plain</reportFormat>

<!-- Output test execution times in the logs -->
<redirectTestOutputToFile>false</redirectTestOutputToFile>
</configuration>
</plugin>
<plugin>
Expand Down
59 changes: 59 additions & 0 deletions run-integration-tests.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/bin/bash

# Store the root directory (where mvnw is located)
ROOT_DIR="$(pwd)"

# Check if we're in the correct directory
if [ ! -f "./mvnw" ]; then
echo "Error: Must be run from directory containing mvnw"
exit 1
fi

# Check if vector-store directory exists
if [ ! -d "./vector-stores" ]; then
echo "Error: vector-stores directory not found"
exit 1
fi

# Function to log with timestamp
log() {
echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1"
}

# Get list of directories
log "Finding directories under ./vector-store"
directories=$(find ./vector-stores -type d -mindepth 1)

if [ -z "$directories" ]; then
log "No directories found under ./vector-stores"
exit 1
fi

# Print found directories
log "Found directories:"
echo "$directories" | sed 's/^/ /'

# Process each directory
while IFS= read -r dir; do
log "Processing directory: $dir"
cd "$dir" || continue

log "Running Maven integration tests for $dir"
# Use the mvnw from the root directory
"$ROOT_DIR/mvnw" package -Pintegration-tests

build_status=$?
if [ $build_status -eq 0 ]; then
log "Maven build completed successfully for $dir"
else
log "Maven build failed for $dir"
# Return to root directory before exiting
cd "$ROOT_DIR"
exit 1
fi

# Return to root directory for next iteration
cd "$ROOT_DIR"
done <<< "$directories"

log "All directories processed successfully"
59 changes: 59 additions & 0 deletions run-integration-tests.sh~
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/bin/bash

# Store the root directory (where mvnw is located)
ROOT_DIR="$(pwd)"

# Check if we're in the correct directory
if [ ! -f "./mvnw" ]; then
echo "Error: Must be run from directory containing mvnw"
exit 1
fi

# Check if vector-store directory exists
if [ ! -d "./vector-store" ]; then
echo "Error: vector-store directory not found"
exit 1
fi

# Function to log with timestamp
log() {
echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1"
}

# Get list of directories
log "Finding directories under ./vector-store"
directories=$(find ./vector-store -type d -mindepth 1)

if [ -z "$directories" ]; then
log "No directories found under ./vector-store"
exit 1
fi

# Print found directories
log "Found directories:"
echo "$directories" | sed 's/^/ /'

# Process each directory
while IFS= read -r dir; do
log "Processing directory: $dir"
cd "$dir" || continue

log "Running Maven integration tests for $dir"
# Use the mvnw from the root directory
"$ROOT_DIR/mvnw" package -Pintegration-tests

build_status=$?
if [ $build_status -eq 0 ]; then
log "Maven build completed successfully for $dir"
else
log "Maven build failed for $dir"
# Return to root directory before exiting
cd "$ROOT_DIR"
exit 1
fi

# Return to root directory for next iteration
cd "$ROOT_DIR"
done <<< "$directories"

log "All directories processed successfully"
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

CREATE KEYSPACE IF NOT EXISTS test_wikidata WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};

CREATE TABLE IF NOT EXISTS test_wikidata.articles (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
/*
* Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

CREATE KEYSPACE IF NOT EXISTS test_wikidata WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

CREATE KEYSPACE IF NOT EXISTS test_wikidata WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};

CREATE TABLE IF NOT EXISTS test_wikidata.articles (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

CREATE KEYSPACE IF NOT EXISTS test_wikidata WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};

CREATE TABLE IF NOT EXISTS test_wikidata.articles (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

CREATE KEYSPACE IF NOT EXISTS test_wikidata WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};

CREATE TABLE IF NOT EXISTS test_wikidata.articles (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Copyright 2023-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

CREATE KEYSPACE IF NOT EXISTS test_wikidata WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};

CREATE TABLE IF NOT EXISTS test_wikidata.articles (
Expand Down

0 comments on commit 3f85f79

Please sign in to comment.