www/p5-Catalyst-Plugin-Session-PerUser : Fix the test

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

www/p5-Catalyst-Plugin-Session-PerUser : Fix the test

wen heping
Hi, ports@:

    Here is a patch for www/p5-Catalyst-Plugin-Session-PerUser :
    1) Fix the test by adding missing TEST_DEPENDS www/p5-Catalyst-Plugin-Session-PerUser
    2) sort RUN_DEPENDS
    3) I am not sure whether or REVISION shoube bumped, since only TEST_DEPENDS changed.
    4) I did not add POD_TEST to MAKE_ENV, because pod tests failed.  I think no need to fix it.

    It build well and now passed all tests on my amd64-head system.

Comments? OK?

wen

p5-Catalyst-Plugin-Session-PerUser-p0.diff.txt (960 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: www/p5-Catalyst-Plugin-Session-PerUser : Fix the test

Charlene Wendling
On Wed, 17 Jul 2019 08:19:04 +0000
wen heping wrote:

> Hi, ports@:
>
>     Here is a patch for www/p5-Catalyst-Plugin-Session-PerUser :
>     1) Fix the test by adding missing TEST_DEPENDS
> www/p5-Catalyst-Plugin-Session-PerUser
>     2) sort RUN_DEPENDS
>     3) I am not sure whether or REVISION shoube bumped, since only
> TEST_DEPENDS changed.

It changes nothing to the resulting package, so yes you don't need to.

>     4) I did not add POD_TEST to MAKE_ENV, because pod tests failed.
> I think no need to fix it.

See how i handled that in the below diff ;)

>     It build well and now passed all tests on my amd64-head system.
>
> Comments? OK?
>
> wen

I also fixed a trailing whitespace while here.

Charlène.


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/p5-Catalyst-Plugin-Session-PerUser/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile 12 Jul 2019 20:50:51 -0000 1.12
+++ Makefile 20 Jul 2019 10:45:20 -0000
@@ -10,16 +10,21 @@ CATEGORIES= www
 # Artistic + GPL
 PERMIT_PACKAGE= Yes
 
-RUN_DEPENDS= www/p5-Catalyst-Plugin-Session \
- security/p5-Catalyst-Plugin-Authentication \
- devel/p5-Hash-Merge \
+RUN_DEPENDS= devel/p5-Hash-Merge \
  devel/p5-Moose \
  devel/p5-MRO-Compat \
+ devel/p5-Object-Signature \
  devel/p5-namespace-autoclean \
- devel/p5-Object-Signature
+ security/p5-Catalyst-Plugin-Authentication \
+ www/p5-Catalyst-Plugin-Session
 
-TEST_DEPENDS=devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS= devel/p5-Test-WWW-Mechanize-Catalyst \
+ www/p5-Catalyst-Plugin-Session-State-Cookie
 
 CONFIGURE_STYLE = modinst
+
+# Disable Pod Testing: there is an extraneous "=item". If we remove it,
+# the .orig file will be tested as well, and in the end it fails anyway.
+MAKE_ENV += TEST_POD=
 
 .include <bsd.port.mk>
Index: patches/patch-lib_Catalyst_Plugin_Session_PerUser_pm
===================================================================
RCS file: patches/patch-lib_Catalyst_Plugin_Session_PerUser_pm
diff -N patches/patch-lib_Catalyst_Plugin_Session_PerUser_pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Catalyst_Plugin_Session_PerUser_pm 20 Jul 2019 10:45:20 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Remove extraneous =item with no text associated
+
+Index: lib/Catalyst/Plugin/Session/PerUser.pm
+--- lib/Catalyst/Plugin/Session/PerUser.pm.orig
++++ lib/Catalyst/Plugin/Session/PerUser.pm
+@@ -260,8 +260,6 @@ login. On by default.
+
+ Passed to L<Hash::Merge/set_behavior>. Defaults to C<RIGHT_PRECEDENT>.
+
+-=item
+-
+ =back
+
+ =head1 CAVEATS
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/www/p5-Catalyst-Plugin-Session-PerUser/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 5 Nov 2006 16:11:31 -0000 1.1.1.1
+++ pkg/DESCR 20 Jul 2019 10:45:20 -0000
@@ -1,7 +1,7 @@
 Allows logged-in users to keep their sessions across logins.
 
 The session data can be stored within the user,
-or within the session store, depending on other plugins
+or within the session store, depending on other plugins
 availability.
 
 e.g, based on Catalyst::Plugin::Authentication::Store

Reply | Threaded
Open this post in threaded view
|

回复: www/p5-Catalyst-Plugin-Session-PerUser : Fix the test

wen heping
Revised patch.
Thank cwen@!

wen
________________________________
发件人: Charlene Wendling <[hidden email]>
发送时间: 2019年7月20日 18:51
收件人: wen heping <[hidden email]>
抄送: [hidden email] <[hidden email]>
主题: Re: www/p5-Catalyst-Plugin-Session-PerUser : Fix the test

On Wed, 17 Jul 2019 08:19:04 +0000
wen heping wrote:

> Hi, ports@:
>
>     Here is a patch for www/p5-Catalyst-Plugin-Session-PerUser :
>     1) Fix the test by adding missing TEST_DEPENDS
> www/p5-Catalyst-Plugin-Session-PerUser
>     2) sort RUN_DEPENDS
>     3) I am not sure whether or REVISION shoube bumped, since only
> TEST_DEPENDS changed.

It changes nothing to the resulting package, so yes you don't need to.

>     4) I did not add POD_TEST to MAKE_ENV, because pod tests failed.
> I think no need to fix it.

See how i handled that in the below diff ;)

>     It build well and now passed all tests on my amd64-head system.
>
> Comments? OK?
>
> wen

I also fixed a trailing whitespace while here.

Charlène.


Index: Makefile
===================================================================
RCS file: /cvs/ports/www/p5-Catalyst-Plugin-Session-PerUser/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile    12 Jul 2019 20:50:51 -0000      1.12
+++ Makefile    20 Jul 2019 10:45:20 -0000
@@ -10,16 +10,21 @@ CATEGORIES= www
 # Artistic + GPL
 PERMIT_PACKAGE= Yes

-RUN_DEPENDS=   www/p5-Catalyst-Plugin-Session \
-               security/p5-Catalyst-Plugin-Authentication \
-               devel/p5-Hash-Merge \
+RUN_DEPENDS=   devel/p5-Hash-Merge \
                 devel/p5-Moose \
                 devel/p5-MRO-Compat \
+               devel/p5-Object-Signature \
                 devel/p5-namespace-autoclean \
-               devel/p5-Object-Signature
+               security/p5-Catalyst-Plugin-Authentication \
+               www/p5-Catalyst-Plugin-Session

-TEST_DEPENDS=devel/p5-Test-WWW-Mechanize-Catalyst
+TEST_DEPENDS=  devel/p5-Test-WWW-Mechanize-Catalyst \
+               www/p5-Catalyst-Plugin-Session-State-Cookie

 CONFIGURE_STYLE =       modinst
+
+# Disable Pod Testing: there is an extraneous "=item". If we remove it,
+# the .orig file will be tested as well, and in the end it fails anyway.
+MAKE_ENV +=    TEST_POD=

 .include <bsd.port.mk>
Index: patches/patch-lib_Catalyst_Plugin_Session_PerUser_pm
===================================================================
RCS file: patches/patch-lib_Catalyst_Plugin_Session_PerUser_pm
diff -N patches/patch-lib_Catalyst_Plugin_Session_PerUser_pm
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_Catalyst_Plugin_Session_PerUser_pm        20 Jul 2019 10:45:20 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Remove extraneous =item with no text associated
+
+Index: lib/Catalyst/Plugin/Session/PerUser.pm
+--- lib/Catalyst/Plugin/Session/PerUser.pm.orig
++++ lib/Catalyst/Plugin/Session/PerUser.pm
+@@ -260,8 +260,6 @@ login. On by default.
+
+ Passed to L<Hash::Merge/set_behavior>. Defaults to C<RIGHT_PRECEDENT>.
+
+-=item
+-
+ =back
+
+ =head1 CAVEATS
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/www/p5-Catalyst-Plugin-Session-PerUser/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 DESCR
--- pkg/DESCR   5 Nov 2006 16:11:31 -0000       1.1.1.1
+++ pkg/DESCR   20 Jul 2019 10:45:20 -0000
@@ -1,7 +1,7 @@
 Allows logged-in users to keep their sessions across logins.

 The session data can be stored within the user,
-or within the session store, depending on other plugins
+or within the session store, depending on other plugins
 availability.

 e.g, based on Catalyst::Plugin::Authentication::Store

p5-Catalyst-Plugin-Session-PerUser-p1.diff.txt (2K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: www/p5-Catalyst-Plugin-Session-PerUser : Fix the test

Stuart Henderson
In reply to this post by wen heping
On 2019/07/17 08:19, wen heping wrote:

> Hi, ports@:
>
>     Here is a patch for www/p5-Catalyst-Plugin-Session-PerUser :
>     1) Fix the test by adding missing TEST_DEPENDS www/p5-Catalyst-Plugin-Session-PerUser
>     2) sort RUN_DEPENDS
>     3) I am not sure whether or REVISION shoube bumped, since only TEST_DEPENDS changed.
>     4) I did not add POD_TEST to MAKE_ENV, because pod tests failed.  I think no need to fix it.
>
>     It build well and now passed all tests on my amd64-head system.
>
> Comments? OK?

committed.

I checked for REVISION bump - not needed for this - no change to package
contents, and I did "make package" before / "make repackage" after applying
the diff to ensure it didn't trip PLIST_DB.


>  PERMIT_PACKAGE= Yes
>  
> -RUN_DEPENDS= www/p5-Catalyst-Plugin-Session \
> - security/p5-Catalyst-Plugin-Authentication \
> - devel/p5-Hash-Merge \
> +RUN_DEPENDS= devel/p5-Hash-Merge \
>   devel/p5-Moose \
>   devel/p5-MRO-Compat \
> + devel/p5-Object-Signature \
>   devel/p5-namespace-autoclean \
> - devel/p5-Object-Signature
> + security/p5-Catalyst-Plugin-Authentication \
> + www/p5-Catalyst-Plugin-Session
>  
> -TEST_DEPENDS=devel/p5-Test-WWW-Mechanize-Catalyst
> +TEST_DEPENDS= devel/p5-Test-WWW-Mechanize-Catalyst \
> + www/p5-Catalyst-Plugin-Session-State-Cookie
>  
>  CONFIGURE_STYLE = modinst
>