Skip to content

GEODE-8469: fix windows test failure #5542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
onichols-pivotal merged 2 commits into from
Sep 23, 2020
Merged

GEODE-8469: fix windows test failure #5542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f355f65
fix commit message in bump script
onichols-pivotal Sep 23, 2020
0003f1c
fix for windows
onichols-pivotal Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev-tools/dependencies/bump.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,15 @@ fi
NAME="$1"
SRCH="$2"
REPL="$3"
OLDV="$SRCH"
SRCH=${SRCH//./\\.}
git grep -n --color "$SRCH" | cat
git grep -l "$SRCH" | while read f; do
sed -e "s/$SRCH/$REPL/g" -i.bak $f || true
rm -f $f.bak
done
git add -p
git commit -m "Bump $NAME from $OLDV to $NEWV"
git commit -m "Bump $NAME from $OLDV to $REPL"
if [ $(git diff | wc -l) -gt 0 ] ; then
git stash
git stash drop
Expand Down
4 changes: 2 additions & 2 deletions geode-junit/src/test/java/org/apache/geode/test/junit/rules/ExpectedTimeoutRuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ public void failsWithExpectedTimeoutButWrongError() {
assertThat(failures.size()).as("Failures: " + failures).isEqualTo(1);

Failure failure = failures.get(0);
String expectedMessage = "\n"
String expectedMessage = System.lineSeparator()
+ "Expected: (an instance of java.util.concurrent.TimeoutException and exception with message a string containing \"this is a message for FailsWithExpectedTimeoutButWrongError\")"
+ "\n" + " "
+ System.lineSeparator() + " "
+ "but: an instance of java.util.concurrent.TimeoutException <java.lang.NullPointerException> is a java.lang.NullPointerException";
assertThat(failure.getException()).isExactlyInstanceOf(AssertionError.class)
.hasMessageContaining(expectedMessage);
Expand Down