Stabalize IMAP parallel testing, again

Girgias · Girgias · commit c4646371f1f5 · 2020-11-06T14:26:47.000Z
Drive by clean-up
Use less the default mailbox again
diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt
@@ -12,9 +12,6 @@ require_once(__DIR__.'/setup/imap_include.inc');
 
 echo "Create a new mailbox for test\n";
 $imap_stream = setup_test_mailbox("imapbodybasic", 1);
-if (!is_resource($imap_stream)) {
-    exit("TEST FAILED: Unable to create test mailbox\n");
-}
 
 $check = imap_check($imap_stream);
 echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
diff --git a/ext/imap/tests/imap_bodystruct_basic.phpt b/ext/imap/tests/imap_bodystruct_basic.phpt
@@ -11,57 +11,41 @@ require_once(__DIR__.'/setup/imap_include.inc');
 
 echo "Create a new mailbox for test and add a multipart msgs\n";
 $imap_stream = setup_test_mailbox("imapbodystructbasic", 1, $mailbox, "multipart");
-if (!is_resource($imap_stream)) {
-    exit("TEST FAILED: Unable to create test mailbox\n");
-}
 
 echo "\nGet and validate structure of body part 1\n";
 
 $m = imap_bodystruct($imap_stream, 1, "1");
 
-$mandatoryFields = array(
-                    'ifsubtype',
-                    'ifdescription',
-                    'ifid',
-                    'ifdisposition',
-                    'ifdparameters',
-                    'ifparameters',
-                    );
+$mandatoryFields = [
+    'ifsubtype',
+    'ifdescription',
+    'ifid',
+    'ifdisposition',
+    'ifdparameters',
+    'ifparameters',
+];
+
+function isValid($param) {
+    return ($param == 0) || ($param == 1);
+}
 
-foreach($mandatoryFields as $mf)
-{
-  if(isValid($m->$mf))
-  {
-    echo "$mf is 0 or 1\n";
-  }
-  else
-  {
-    echo "$mf FAIL\n";
-  }
+foreach($mandatoryFields as $mf) {
+    if (isValid($m->$mf)) {
+        echo "$mf is 0 or 1\n";
+    } else {
+        echo "$mf FAIL\n";
+    }
 }
 
-if(is_array($m->parameters))
-{
-  echo "parameters is an array\n";
+if(is_array($m->parameters)) {
+    echo "parameters is an array\n";
 }
 
 echo "\nTry to get part 4!\n";
 var_dump(imap_bodystruct($imap_stream, 1, "4"));
 
 imap_close($imap_stream);
 
-function isValid($param)
-{
- if(($param == 0) || ($param == 1))
- {
-   $result=true;
- }
- else
- {
-   $result=false;
- }
-return $result;
-}
 ?>
 --CLEAN--
 <?php
diff --git a/ext/imap/tests/imap_clearflag_full_basic.phpt b/ext/imap/tests/imap_clearflag_full_basic.phpt
@@ -12,9 +12,6 @@ require_once(__DIR__.'/setup/imap_include.inc');
 
 echo "Create a new mailbox for test\n";
 $imap_stream = setup_test_mailbox("imapclearflagfullbasic", 10);
-if (!is_resource($imap_stream)) {
-    exit("TEST FAILED: Unable to create test mailbox\n");
-}
 
 $check = imap_check($imap_stream);
 echo "Initial msg count in new_mailbox : ". $check->Nmsgs . "\n";
diff --git a/ext/imap/tests/imap_mail_copy_basic.phpt b/ext/imap/tests/imap_mail_copy_basic.phpt
@@ -6,31 +6,25 @@ Olivier Doucet
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 echo "*** Testing imap_mail_copy() : basic functionality ***\n";
 
 require_once(__DIR__.'/setup/imap_include.inc');
 
-
 echo "Create a new mailbox for test\n";
-$imap_stream = setup_test_mailbox("", 1);
-if (!is_resource($imap_stream)) {
-    exit("TEST FAILED: Unable to create test mailbox\n");
-}
+$imap_stream = setup_test_mailbox('copybasic', 1);
 
 $check = imap_check($imap_stream);
 echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
 
-var_dump(imap_mail_copy($imap_stream, '1', 'INBOX.'.IMAP_MAILBOX_PHPT_PREFIX));
+var_dump(imap_mail_copy($imap_stream, '1', 'INBOX.' . IMAP_MAILBOX_PHPT_PREFIX  . 'copybasic'));
 
 imap_close($imap_stream);
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = '';
+$mailbox_suffix = 'copybasic';
 require_once('setup/clean.inc');
 ?>
 --EXPECT--
diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt
@@ -6,28 +6,25 @@ Olivier Doucet
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 echo "*** Testing imap_mail_move() : basic functionality ***\n";
 
 require_once(__DIR__.'/setup/imap_include.inc');
 
-
 echo "Create a new mailbox for test\n";
-$imap_stream = setup_test_mailbox("", 1);
+$imap_stream = setup_test_mailbox("movebasic", 1);
 
 $check = imap_check($imap_stream);
 echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
 
-var_dump(imap_mail_move($imap_stream, '1', 'INBOX.'. IMAP_MAILBOX_PHPT_PREFIX));
+var_dump(imap_mail_move($imap_stream, '1', 'INBOX.' . IMAP_MAILBOX_PHPT_PREFIX . 'movebasic'));
 
 imap_close($imap_stream);
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = '';
+$mailbox_suffix = 'movebasic';
 require_once(__DIR__.'/setup/clean.inc');
 ?>
 --EXPECT--
diff --git a/ext/imap/tests/imap_renamemailbox_basic.phpt b/ext/imap/tests/imap_renamemailbox_basic.phpt
@@ -6,16 +6,14 @@ Olivier Doucet
 <?php
 require_once(__DIR__.'/setup/skipif.inc');
 ?>
---CONFLICTS--
-defaultmailbox
 --FILE--
 <?php
 
 require_once(__DIR__.'/setup/imap_include.inc');
 
-$stream_id = setup_test_mailbox('imaprenamemailbox', 1);
+$stream_id = setup_test_mailbox('imaprenamemailbox1', 1);
 
-$newbox = IMAP_DEFAULT_MAILBOX . "." . IMAP_MAILBOX_PHPT_PREFIX;
+$mailboxBaseName = IMAP_DEFAULT_MAILBOX . '.' . IMAP_MAILBOX_PHPT_PREFIX;
 
 //commented because of bug #49901
 //$ancError = error_reporting(0);
@@ -24,20 +22,17 @@ $newbox = IMAP_DEFAULT_MAILBOX . "." . IMAP_MAILBOX_PHPT_PREFIX;
 //error_reporting($ancError);
 echo "Checking OK\n";
 
-
-var_dump(imap_createmailbox($stream_id, $newbox.'.test'));
-var_dump(imap_renamemailbox($stream_id, $newbox.'.test', $newbox.'.testd'));
+var_dump(imap_renamemailbox($stream_id, $mailboxBaseName . 'imaprenamemailbox1', $mailboxBaseName . 'imaprenamemailbox2'));
 
 imap_close($stream_id);
 ?>
 --CLEAN--
 <?php
-$mailbox_suffix = 'imaprenamemailbox';
+$mailbox_suffix = ['imaprenamemailbox1', 'imaprenamemailbox2'];
 require_once('setup/clean.inc');
 ?>
 --EXPECT--
 Create a temporary mailbox and add 1 msgs
 New mailbox created
 Checking OK
 bool(true)
-bool(true)
diff --git a/ext/imap/tests/setup/clean.inc b/ext/imap/tests/setup/clean.inc
@@ -1,6 +1,8 @@
 <?php
 require_once 'imap_include.inc';
 
+if (!isset($mailbox_suffix)) { throw new Exception("No suffix provided"); }
+
 $imap_stream = imap_open(IMAP_DEFAULT_MAILBOX, IMAP_MAILBOX_USERNAME, IMAP_MAILBOX_PASSWORD);
 
 // delete all msgs in default mailbox, i.e INBOX
@@ -9,14 +11,21 @@ for ($i = 1; $i <= $check->Nmsgs; $i++) {
     imap_delete($imap_stream, $i);
 }
 
-if (!isset($mailbox_suffix)) { throw new Exception("No suffix provided"); }
 
 $mailboxes = imap_getmailboxes($imap_stream, IMAP_SERVER, '*');
 
-foreach($mailboxes as $value) {
-    // Only delete mailbox with our prefix (+ optional test suffix)
-    if (preg_match('/\{.*?\}INBOX\.' . IMAP_MAILBOX_PHPT_PREFIX . $mailbox_suffix .'$/', $value->name, $match) == 1) {
-        imap_deletemailbox($imap_stream, $value->name);
+if (!is_array($mailbox_suffix)) {
+    $mailbox_suffixes = [$mailbox_suffix];
+} else {
+    $mailbox_suffixes = $mailbox_suffix;
+}
+
+foreach ($mailbox_suffixes as $mailbox_suffix) {
+    foreach($mailboxes as $value) {
+        // Only delete mailbox with our prefix (+ optional test suffix)
+        if (preg_match('/\{.*?\}INBOX\.' . IMAP_MAILBOX_PHPT_PREFIX . $mailbox_suffix .'$/', $value->name, $match) == 1) {
+            imap_deletemailbox($imap_stream, $value->name);
+        }
     }
 }
 
