GNU bug report logs - #30062
[PATCH core-updates] gnu: java-ops4j-pax-tinybundles: Disable failing test.

Previous Next

Package: guix-patches;

Reported by: Gábor Boskovits <boskovits <at> gmail.com>

Date: Wed, 10 Jan 2018 09:35:02 UTC

Severity: normal

Tags: patch

Done: Danny Milosavljevic <dannym <at> scratchpost.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30062 in the body.
You can then email your comments to 30062 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#30062; Package guix-patches. (Wed, 10 Jan 2018 09:35:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Gábor Boskovits <boskovits <at> gmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Wed, 10 Jan 2018 09:35:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Gábor Boskovits <boskovits <at> gmail.com>
Subject: [PATCH core-updates] gnu: java-ops4j-pax-tinybundles: Disable failing
 test.
Date: Wed, 10 Jan 2018 10:33:08 +0100
* gnu/packages/java.scm (java-ops4j-pax-tinybundles)[arguments]: Modify #:test-exclude
to disable all bnd tests.

The bnd testsuite hardcodes the version of bnd, making it impossible to update bnd
independently. Disable it to avoid test failures on bnd updates.
---
 gnu/packages/java.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index e1e9093df..3e32eb882 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6054,7 +6054,8 @@ it manages project dependencies, gives diffs jars, and much more.")
        #:source-dir "src/main/java"
        #:test-exclude
        ;; Abstract base classes for other tests
-       (list "**/BndTest.java" "**/CoreTest.java")
+       ;; Disable bnd tests, they hardcode the version of bnd.
+       (list "**/Bnd*Test.java" "**/CoreTest.java")
        #:phases
        (modify-phases %standard-phases
          (add-before 'check 'fix-version
-- 
2.15.1





Information forwarded to guix-patches <at> gnu.org:
bug#30062; Package guix-patches. (Wed, 10 Jan 2018 10:35:01 GMT) Full text and rfc822 format available.

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: julien lepiller <julien <at> lepiller.eu>
To: guix-patches <at> gnu.org
Subject: Re: [bug#30062] [PATCH core-updates] gnu: java-ops4j-pax-tinybundles:
 Disable failing test.
Date: Wed, 10 Jan 2018 11:33:48 +0100
Le 2018-01-10 10:33, Gábor Boskovits a écrit :
> * gnu/packages/java.scm (java-ops4j-pax-tinybundles)[arguments]:
> Modify #:test-exclude
> to disable all bnd tests.
> 
> The bnd testsuite hardcodes the version of bnd, making it impossible
> to update bnd
> independently. Disable it to avoid test failures on bnd updates.
> ---
>  gnu/packages/java.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index e1e9093df..3e32eb882 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -6054,7 +6054,8 @@ it manages project dependencies, gives diffs
> jars, and much more.")
>         #:source-dir "src/main/java"
>         #:test-exclude
>         ;; Abstract base classes for other tests
> -       (list "**/BndTest.java" "**/CoreTest.java")
> +       ;; Disable bnd tests, they hardcode the version of bnd.
> +       (list "**/Bnd*Test.java" "**/CoreTest.java")
>         #:phases
>         (modify-phases %standard-phases
>           (add-before 'check 'fix-version

Couldn't we use substitute* to replace the hardcoded version with our 
own version of bnd?




Information forwarded to guix-patches <at> gnu.org:
bug#30062; Package guix-patches. (Sat, 20 Jan 2018 22:11:02 GMT) Full text and rfc822 format available.

Message #11 received at 30062 <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: 30062 <at> debbugs.gnu.org, julien <at> lepiller.eu
Subject: Replace the version in the test
Date: Sat, 20 Jan 2018 23:10:15 +0100
[Message part 1 (text/plain, inline)]
Hello!

Unfortunately I did not get the previous message on this bug.
I will have a look into this if we can use substitute* to replace the
version.

I will send my findings and an update patch, if possible.
[Message part 2 (text/html, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#30062; Package guix-patches. (Mon, 29 Jan 2018 09:06:01 GMT) Full text and rfc822 format available.

Message #14 received at 30062 <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: Chris Marusich <cmmarusich <at> gmail.com>, 30062 <at> debbugs.gnu.org
Subject: Help wanted
Date: Mon, 29 Jan 2018 10:05:21 +0100
[Message part 1 (text/plain, inline)]
Hello Chris!

Could you help me out on this?

It seems that I should somehow extract the version string from the input to
use in substitute*, to fix the version string in tests. What would be the
proper way of doing this?
[Message part 2 (text/html, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#30062; Package guix-patches. (Mon, 29 Jan 2018 09:23:02 GMT) Full text and rfc822 format available.

Message #17 received at 30062 <at> debbugs.gnu.org (full text, mbox):

From: Chris Marusich <cmmarusich <at> gmail.com>
To: Gábor Boskovits <boskovits <at> gmail.com>
Cc: 30062 <at> debbugs.gnu.org
Subject: Re: [bug#30062] Help wanted
Date: Mon, 29 Jan 2018 01:22:01 -0800
[Message part 1 (text/plain, inline)]
Gábor Boskovits <boskovits <at> gmail.com> writes:

> Hello Chris!
>
> Could you help me out on this?
>
> It seems that I should somehow extract the version string from the input to
> use in substitute*, to fix the version string in tests. What would be the
> proper way of doing this?

It looks like the existing code is already substituting the version
string (by hard-coding it):

--8<---------------cut here---------------start------------->8---
(arguments
     `(#:jar-name "java-ops4j-pax-tinybundles.jar"
       #:source-dir "src/main/java"
       #:test-exclude
       ;; Abstract base classes for other tests
       (list "**/BndTest.java" "**/CoreTest.java")
       #:phases
       (modify-phases %standard-phases
         (add-before 'check 'fix-version
           (lambda _
             ;; This test has a reference to an old version of bndlib we are not
             ;; packaging.  It uses the version referenced in pom.xml.  We replace
             ;; it with our own version.
             (substitute* "src/test/java/org/ops4j/pax/tinybundles/bnd/BndTest.java"
               (("2.4.0.201411031534") "3.4.0")))))))
--8<---------------cut here---------------end--------------->8---

I think we could probably just make a change like the following (I
haven't tested this, though):

--8<---------------cut here---------------start------------->8---
             (substitute* "src/test/java/org/ops4j/pax/tinybundles/bnd/BndTest.java"
-               (("2.4.0.201411031534") "3.4.0")))))))
+               (("2.4.0.201411031534") ,(package-version java-aqute-bndlib))))))))
--8<---------------cut here---------------end--------------->8---

The comma is 'unquote' (see: (guile) Expression Syntax), which should
insert the package version of java-aqute-bndlib into the quasi-quoted
list.

Does that help?

-- 
Chris
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#30062; Package guix-patches. (Mon, 29 Jan 2018 09:56:02 GMT) Full text and rfc822 format available.

Message #20 received at 30062 <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: Chris Marusich <cmmarusich <at> gmail.com>
Cc: 30062 <at> debbugs.gnu.org
Subject: Re: [bug#30062] Help wanted
Date: Mon, 29 Jan 2018 10:55:25 +0100
[Message part 1 (text/plain, inline)]
2018-01-29 10:22 GMT+01:00 Chris Marusich <cmmarusich <at> gmail.com>:

> Gábor Boskovits <boskovits <at> gmail.com> writes:
>
> > Hello Chris!
> >
> > Could you help me out on this?
> >
> > It seems that I should somehow extract the version string from the input
> to
> > use in substitute*, to fix the version string in tests. What would be the
> > proper way of doing this?
>
> It looks like the existing code is already substituting the version
> string (by hard-coding it):
>
> --8<---------------cut here---------------start------------->8---
> (arguments
>      `(#:jar-name "java-ops4j-pax-tinybundles.jar"
>        #:source-dir "src/main/java"
>        #:test-exclude
>        ;; Abstract base classes for other tests
>        (list "**/BndTest.java" "**/CoreTest.java")
>        #:phases
>        (modify-phases %standard-phases
>          (add-before 'check 'fix-version
>            (lambda _
>              ;; This test has a reference to an old version of bndlib we
> are not
>              ;; packaging.  It uses the version referenced in pom.xml.  We
> replace
>              ;; it with our own version.
>              (substitute* "src/test/java/org/ops4j/pax/
> tinybundles/bnd/BndTest.java"
>                (("2.4.0.201411031534") "3.4.0")))))))
> --8<---------------cut here---------------end--------------->8---
>
> I think we could probably just make a change like the following (I
> haven't tested this, though):
>
> --8<---------------cut here---------------start------------->8---
>              (substitute* "src/test/java/org/ops4j/pax/
> tinybundles/bnd/BndTest.java"
> -               (("2.4.0.201411031534") "3.4.0")))))))
> +               (("2.4.0.201411031534") ,(package-version
> java-aqute-bndlib))))))))
> --8<---------------cut here---------------end--------------->8---
>
> The comma is 'unquote' (see: (guile) Expression Syntax), which should
> insert the package version of java-aqute-bndlib into the quasi-quoted
> list.
>
> Does that help?
>
> Yes, thanks. This has the piece of information I was missing.
I would also like to replace the matching expression to be something less
specific, because
it would be nice, if upon upgrade we could just flip the version and the
hash.
I will try to get this done by wednesday.


> --
> Chris
>
[Message part 2 (text/html, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#30062; Package guix-patches. (Mon, 29 Jan 2018 10:09:01 GMT) Full text and rfc822 format available.

Message #23 received at 30062 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: Gábor Boskovits <boskovits <at> gmail.com>
Cc: 30062 <at> debbugs.gnu.org, Chris Marusich <cmmarusich <at> gmail.com>
Subject: Re: [bug#30062] Help wanted
Date: Mon, 29 Jan 2018 11:08:08 +0100
Hi Gabor,

I've checked the source code of org.ops4j.pax.tinybundles-tinybundles-2.1.1

~/x/org.ops4j.pax.tinybundles-tinybundles-2.1.1$ grep -r 2.4.0.2014 .
./src/test/java/org/ops4j/pax/tinybundles/bnd/BndTest.java:        assertEquals( "Header Tool", "Bnd-2.4.0.201411031534", man.getMainAttributes().getValue( "Tool" ) );

So the substitution could also be

             (substitute* "src/test/java/org/ops4j/pax/tinybundles/bnd/BndTest.java"
               (("2\\.4\\.0\\.[0-9][0-9]*")
                ,(package-version java-aqute-bndlib)))

Or maybe even

             (substitute* "src/test/java/org/ops4j/pax/tinybundles/bnd/BndTest.java"
               (("[0-9][0-9]*\\.[0-9][0-9]*.[0-9][0-9]*\\.[0-9][0-9]*")
                ,(package-version java-aqute-bndlib)))




Information forwarded to guix-patches <at> gnu.org:
bug#30062; Package guix-patches. (Sat, 03 Mar 2018 22:00:02 GMT) Full text and rfc822 format available.

Message #26 received at 30062 <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: 30062 <at> debbugs.gnu.org
Cc: Gábor Boskovits <boskovits <at> gmail.com>
Subject: [PATCH] gnu: java-ops4j-pax-tinybundles: Use distribution bndlib
 version.
Date: Sat,  3 Mar 2018 22:59:05 +0100
* gnu/packages/java.scm (java-ops4j-pax-tinybundles)[arguments](#phases):
Modify fix-version to use the distibution version of java-aqute-bndlib.
---
 gnu/packages/java.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 0f8c04e8b..cdf4cba82 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6537,7 +6537,8 @@ it manages project dependencies, gives diffs jars, and much more.")
              ;; packaging.  It uses the version referenced in pom.xml.  We replace
              ;; it with our own version.
              (substitute* "src/test/java/org/ops4j/pax/tinybundles/bnd/BndTest.java"
-               (("2.4.0.201411031534") "3.4.0")))))))
+               (("[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*\\.[0-9][0-9]*")
+                ,(package-version java-aqute-bndlib))))))))
     (inputs
      `(("lang" ,java-ops4j-base-lang)
        ("io" ,java-ops4j-base-io)
-- 
2.16.2





Information forwarded to guix-patches <at> gnu.org:
bug#30062; Package guix-patches. (Sat, 03 Mar 2018 22:14:02 GMT) Full text and rfc822 format available.

Message #29 received at 30062 <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: 30062 <at> debbugs.gnu.org
Subject: Unblocks #29893
Date: Sat, 3 Mar 2018 23:13:28 +0100
[Message part 1 (text/plain, inline)]
Once this is merged please also merge #29893.
[Message part 2 (text/html, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#30062; Package guix-patches. (Sun, 04 Mar 2018 09:03:02 GMT) Full text and rfc822 format available.

Message #32 received at 30062 <at> debbugs.gnu.org (full text, mbox):

From: Gábor Boskovits <boskovits <at> gmail.com>
To: 30062 <at> debbugs.gnu.org
Subject: Please push this to master
Date: Sun, 4 Mar 2018 10:02:11 +0100
[Message part 1 (text/plain, inline)]
The original tag says this is a core-updates patch, but since then
core-updates has been merged, so please push this to master.
[Message part 2 (text/html, inline)]

bug closed, send any further explanations to 30062 <at> debbugs.gnu.org and Gábor Boskovits <boskovits <at> gmail.com> Request was from Danny Milosavljevic <dannym <at> scratchpost.org> to control <at> debbugs.gnu.org. (Mon, 05 Mar 2018 19:48:02 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 03 Apr 2018 11:24:06 GMT) Full text and rfc822 format available.

This bug report was last modified 5 years and 361 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.