Pierre Gruet pushed to branch master at Debian Med / libsis-base-java
Commits: 78ad5c70 by Pierre Gruet at 2020-12-06T22:01:15+01:00 Deactivate tests that cause a symlink point to nothing - - - - - c41220a4 by Pierre Gruet at 2020-12-06T22:08:47+01:00 Updating Forwarded information in headers of patches - - - - - cc192f6a by Pierre Gruet at 2020-12-06T22:11:41+01:00 Standards version 4.5.1 (no changes needed) - - - - - 6cdcca8f by Pierre Gruet at 2020-12-06T22:26:23+01:00 Update changelog - - - - - 8 changed files: - debian/changelog - debian/control - + debian/patches/deactivate_tests_causing_fail_dut_to_commons-io.patch - debian/patches/load_native_debian.patch - debian/patches/remove_ch_rinn_imports.patch - debian/patches/series - debian/patches/skip_testGetLinkInfoDirectory.patch - debian/patches/skip_testGetLinkInfoSymLinkDanglingLink.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +libsis-base-java (18.09~pre1+git20180928.45fbd31+dfsg-2) UNRELEASED; urgency=medium + + * Team upload + * Deactivate tests that have a symlink point to nothing (Closes: #976490) + * Standards version 4.5.1 (no changes needed) + + -- Pierre Gruet <[email protected]> Sun, 06 Dec 2020 22:12:39 +0100 + libsis-base-java (18.09~pre1+git20180928.45fbd31+dfsg-1) unstable; urgency=medium * New upstream version ===================================== debian/control ===================================== @@ -13,7 +13,7 @@ Build-Depends: debhelper-compat (= 13), testng, libtool, procps -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/med-team/libsis-base-java Vcs-Git: https://salsa.debian.org/med-team/libsis-base-java.git Homepage: https://sissource.ethz.ch/sispub/base ===================================== debian/patches/deactivate_tests_causing_fail_dut_to_commons-io.patch ===================================== @@ -0,0 +1,81 @@ +Description: deactivate tests that cause a symlink pointing to nothing + In the concerned tests, a file named sameOtherFile is created, and at some + point in the afterClass method in AbstractFileSystemTestCase.java, this + symlink points to nothing, which is due to a bug in commons-io 2.8.0. + Those tests are deactivated, but should be activated again once the bug in + commons-io has been fixed. + See bug IO-692 in the bug dashboard on issues.apache.org website. +Author: Pierre Gruet <[email protected]> +Forwarded: not-needed +Last-Update: 2020-12-06 + +--- a/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java ++++ b/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java +@@ -93,6 +93,7 @@ + { "skip_this_test" }) + public void testGetLinkInfoSymLink() throws IOException + { ++/* + final File f = new File(workingDirectory, "someOtherFile"); + final String content = "someMoreText\n"; + FileUtils.writeStringToFile(f, content, Charset.defaultCharset()); +@@ -112,12 +113,14 @@ + assertEquals(FileLinkType.REGULAR_FILE, info2.getLinkType()); + assertFalse(info2.isSymbolicLink()); + assertNull(info2.tryGetSymbolicLink()); ++*/ + } + + @Test(groups = +- { "requires_unix" }) ++ { "skip_this_test" }) + public void testTouchSymLinkAndFileRealtimeTimer() throws IOException, InterruptedException + { ++/* + if (BuildAndEnvironmentInfo.INSTANCE.getOS().contains("2.6.32")) + { + System.out.println(" ...skipping as CentOS6 does not yet support the realtime timer."); +@@ -173,12 +176,14 @@ + assertNotEquals(lastMicros, info3.getLastModifiedTime().getMicroSecPart()); + assertNotEquals(lastMicros, info3.getLastAccessTime().getMicroSecPart()); + ++*/ + } + + @Test(groups = +- { "requires_unix" }) ++ { "skip_this_test" }) + public void testTouchSymLinkAndFile() throws IOException, InterruptedException + { ++/* + Unix.setUseUnixRealtimeTimer(false); + final File f = new File(workingDirectory, "someOtherFile"); + final String content = "someMoreText\n"; +@@ -230,6 +235,7 @@ + assertNotEquals(lastMicros, info3.getLastModifiedTime().getMicroSecPart()); + assertNotEquals(lastMicros, info3.getLastAccessTime().getMicroSecPart()); + ++*/ + } + + @Test(groups = +@@ -280,9 +286,10 @@ + } + + @Test(groups = +- { "requires_unix" }) ++ { "skip_this_test" }) + public void testGetLinkInfoHardLink() throws IOException + { ++/* + final File f = new File(workingDirectory, "someOtherFile"); + f.createNewFile(); + final File s = new File(workingDirectory, "someLink"); +@@ -292,6 +299,7 @@ + assertEquals(FileLinkType.REGULAR_FILE, info.getLinkType()); + assertFalse(info.isSymbolicLink()); + assertNull(info.tryGetSymbolicLink()); ++*/ + } + + @Test(groups = ===================================== debian/patches/load_native_debian.patch ===================================== @@ -4,7 +4,7 @@ Description: upstream applies various methods to look for the Here we just load the library from /usr/lib/jni and quit immediately if linking fails. Author: Tim Booth -Forwarded: no +Forwarded: not-needed Last-Updated: 2015-08-21 --- a/source/java/ch/systemsx/cisd/base/convert/NativeData.java +++ b/source/java/ch/systemsx/cisd/base/convert/NativeData.java ===================================== debian/patches/remove_ch_rinn_imports.patch ===================================== @@ -1,7 +1,7 @@ Subject: unneeded and unavailable method decorator Description: decorator is not available in Debian and is not useful for package Author: Tim Booth -Forwarded: no +Forwarded: not-needed Last-Updated: 2015-08-21 --- a/source/java/ch/systemsx/cisd/base/unix/Unix.java +++ b/source/java/ch/systemsx/cisd/base/unix/Unix.java ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ remove_ch_rinn_imports.patch load_native_debian.patch skip_testGetLinkInfoDirectory.patch skip_testGetLinkInfoSymLinkDanglingLink.patch +deactivate_tests_causing_fail_dut_to_commons-io.patch ===================================== debian/patches/skip_testGetLinkInfoDirectory.patch ===================================== @@ -15,7 +15,7 @@ Description: Skip non-functional test Bug-Debian: https://bugs.debian.org/885962 Author: Andreas Tille <[email protected]> Last-Update: Mon, 15 Jan 2018 07:58:49 +0100 -Forwarded-Upstream: Bernd Rinn <[email protected]> +Forwarded: Bernd Rinn <[email protected]> --- a/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java +++ b/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java ===================================== debian/patches/skip_testGetLinkInfoSymLinkDanglingLink.patch ===================================== @@ -1,6 +1,7 @@ Author: Andreas Tille <[email protected]> Last-Update: Tue, 27 Oct 2020 20:51:16 +0100 Bug-Debian: https://bugs.debian.org/973070 +Forwarded: not-needed Description: Disable the affected test by following https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973070#22 . View it on GitLab: https://salsa.debian.org/med-team/libsis-base-java/-/compare/a98eaaf9dfabfc228870f056638a4c195502bf06...6cdcca8f45e063d347b551d3a1aedfaedcf885cb -- View it on GitLab: https://salsa.debian.org/med-team/libsis-base-java/-/compare/a98eaaf9dfabfc228870f056638a4c195502bf06...6cdcca8f45e063d347b551d3a1aedfaedcf885cb You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
