Tests: Fix Print test on mobile, make GreenMail quiet on folder deletion

tests/Browser/Mail/Open.php

@@ -26,7 +26,6 @@ class Open extends \Tests\Browser\TestCase
         $this->browse(function ($browser) {
             if ($browser->isPhone()) {
                 $this->markTestSkipped();
-                return;
             }
 
             $browser->go('mail');

tests/Browser/Mail/Print.php

@@ -34,7 +34,7 @@ class PrintTest extends \Tests\Browser\TestCase
             $browser->with(new Popupmenu('message-menu'), function ($browser) use (&$current_window, &$new_window) {
                 if ($browser->isPhone()) {
                     $browser->assertMissing('a.print');
-                    return;
+                    $this->markTestSkipped();
                 }
 
                 list($current_window, $new_window) = $browser->openWindow(function ($browser) {

tests/Browser/bootstrap.php

@@ -202,16 +202,21 @@ class bootstrap
             rcube::raise_error(__METHOD__ . ': IMAP connection unavailable', false, true);
         }
 
-        $rcmail     = rcmail::get_instance();
-        $imap       = $rcmail->get_storage();
-        $no_special = $rcmail->config->get('create_special_folders');
+        $rcmail       = rcmail::get_instance();
+        $imap         = $rcmail->get_storage();
+        $got_defaults = $rcmail->config->get('create_default_folders');
+        $vendor       = $imap->get_vendor();
 
         // Note: We do not expect IMAP server auto-creating any folders
         foreach ($imap->list_folders() as $folder) {
-            if ($folder != 'INBOX' && (!$no_special || !$imap->is_special_folder($folder))) {
-                // Note: GreenMail throws errors when unsubscribing deleted folder
-                // We'll ignore that for now
-                $imap->delete_folder($folder);
+            if ($folder != 'INBOX' && (!$got_defaults || !$imap->is_special_folder($folder))) {
+                // GreenMail throws errors when unsubscribing a deleted folder
+                if ($vendor == 'greenmail') {
+                    $imap->conn->deleteFolder($folder);
+                }
+                else {
+                    $imap->delete_folder($folder);
+                }
             }
         }
     }