You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2022/06/15 21:57:36 UTC
svn commit: r1901951 - in /spamassassin/trunk/t: db_awl_perms.t db_awl_perms_welcome_block.t

Author: sidney
Date: Wed Jun 15 21:57:36 2022
New Revision: 1901951

URL: http://svn.apache.org/viewvc?rev=1901951&view=rev
Log:
bug 8003 - disable these tests i Windows since umask is a no-op there

Modified:
    spamassassin/trunk/t/db_awl_perms.t
    spamassassin/trunk/t/db_awl_perms_welcome_block.t

Modified: spamassassin/trunk/t/db_awl_perms.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/db_awl_perms.t?rev=1901951&r1=1901950&r2=1901951&view=diff
==============================================================================
--- spamassassin/trunk/t/db_awl_perms.t (original)
+++ spamassassin/trunk/t/db_awl_perms.t Wed Jun 15 21:57:36 2022
@@ -2,8 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("db_awl_perms");
-use Test::More tests => 5;
 use IO::File;
+use Test::More;
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+plan tests => 5;
 
 # ---------------------------------------------------------------------------
 # bug 6173
@@ -21,7 +23,8 @@ umask 022;
 sarun("--add-addr-to-whitelist whitelist_test\@example.org",
       \&patterns_run_cb);
 
-untaint_system "ls -l $userstate";          # for the logs
+# in case this test is ever made to work on Windows
+untaint_system($RUNNING_ON_WINDOWS?("dir " . File::Spec->canonpath($userstate)):"ls -l $userstate");  # for the logs
 
 sub checkmode {
   my $fname = shift;

Modified: spamassassin/trunk/t/db_awl_perms_welcome_block.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/db_awl_perms_welcome_block.t?rev=1901951&r1=1901950&r2=1901951&view=diff
==============================================================================
--- spamassassin/trunk/t/db_awl_perms_welcome_block.t (original)
+++ spamassassin/trunk/t/db_awl_perms_welcome_block.t Wed Jun 15 21:57:36 2022
@@ -2,8 +2,10 @@
 
 use lib '.'; use lib 't';
 use SATest; sa_t_init("db_awl_perms_welcome_block");
-use Test::More tests => 5;
 use IO::File;
+use Test::More;
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+plan tests => 5;
 
 # ---------------------------------------------------------------------------
 # bug 6173
@@ -21,7 +23,8 @@ umask 022;
 sarun("--add-addr-to-welcomelist whitelist_test\@example.org",
       \&patterns_run_cb);
 
-untaint_system "ls -l $userstate";          # for the logs
+# in case this test is ever made to work on Windows
+untaint_system($RUNNING_ON_WINDOWS?("dir " . File::Spec->canonpath($userstate)):"ls -l $userstate");  # for the logs
 
 sub checkmode {
   my $fname = shift;