Merge remote-tracking branch 'mysociety/refactor-email'

1 files changed, 9 insertions, 3 deletions

diff --git a/t/i18n.t b/t/i18n.t
index 3337f1a7f..550bc2358 100644
--- a/t/i18n.t
+++ b/t/i18n.t
@@ -56,7 +56,7 @@ my @EN_sorted      = qw( A Å Ø Z );
 my @NO_sorted      = qw( A Z Ø Å );
 my @default_sorted = qw( A Z Å Ø );
 
-{
+SKIP: {
 
     mySociety::Locale::negotiate_language(    #
         'en-gb,English,en_GB|cy,Cymraeg,cy_GB', 'en_GB'
@@ -71,12 +71,16 @@ my @default_sorted = qw( A Z Å Ø );
     is_deeply( [ keysort { $_ } @random_sorted ],
         \@default_sorted, "keysort correctly with no locale" );
 
+    skip 'Will not pass on Mac', 1 if $^O eq 'darwin';
+
     # Note - this obeys the locale
     is_deeply( [ sort { strcoll( $a, $b ) } @random_sorted ],
         \@EN_sorted, "sort strcoll correctly with no locale (to 'en_GB')" );
 }
 
-{
+SKIP: {
+    skip 'Will not pass on Mac', 2 if $^O eq 'darwin';
+
     mySociety::Locale::negotiate_language(    #
         'en-gb,English,en_GB|cy,Cymraeg,cy_GB', 'en_GB'
     );
@@ -93,7 +97,9 @@ my @default_sorted = qw( A Z Å Ø );
         \@EN_sorted, "sort strcoll correctly with use locale 'en_GB'" );
 }
 
-{
+SKIP: {
+    skip 'Will not pass on Mac', 2 if $^O eq 'darwin';
+
     mySociety::Locale::negotiate_language(    #
         'nb-no,Norwegian,nb_NO', 'nb_NO'
     );