[checkstyle] Disable unit test that needs network access
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Dec 4 15:29:58 UTC 2012
commit 5838cf011f6ef16d0b676764f0192454cbe77362
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Dec 4 01:30:22 2012 +0100
Disable unit test that needs network access
- Remove rpm bug workaround
checkstyle.spec | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/checkstyle.spec b/checkstyle.spec
index f8d7139..cd5a157 100644
--- a/checkstyle.spec
+++ b/checkstyle.spec
@@ -30,7 +30,7 @@
Name: checkstyle
Version: 5.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java source code checker
URL: http://checkstyle.sourceforge.net/
# src/checkstyle/com/puppycrawl/tools/checkstyle/grammars/java.g is GPLv2+
@@ -117,6 +117,9 @@ sed -i 's/\r//' LICENSE LICENSE.apache20 README RIGHTS.antlr \
contrib/hooks/*.pl src/site/resources/css/*css \
java.header
+# The following test needs network access, so it would fail on Koji
+rm -f src/tests/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
+
%build
mvn-rpmbuild -e install javadoc:aggregate
@@ -154,11 +157,6 @@ cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
checkstyle antlr apache-commons-beanutils apache-commons-cli apache-commons-logging guava
EOF
-%pre javadoc
-# workaround for rpm bug, can be removed in F-18
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
%post
# Note that we're using a fully versioned catalog, so this is always ok.
if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
@@ -194,6 +192,10 @@ fi
%changelog
+* Tue Dec 4 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 5.6-2
+- Disable unit test that needs network access
+- Remove rpm bug workaround
+
* Mon Dec 3 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 5.6-1
- Update to upstream version 5.6
More information about the scm-commits
mailing list