Add default value for test mailbox names

Try to ensure the mailbox name will never be confused with existing mailboxes.
horde · Dec 31, 2014 · d8e8ddd · d8e8ddd
1 parent 6d77371
commit d8e8ddd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/framework/Imap_Client/test/Horde/Imap/Client/Live/Imap.php b/framework/Imap_Client/test/Horde/Imap/Client/Live/Imap.php
@@ -28,16 +28,20 @@ class Horde_Imap_Client_Live_Imap extends Horde_Imap_Client_Live_Base
     public static $config;
 
     private static $created;
-    private static $test_mbox;
-    private static $test_mbox_utf8;
+    private static $test_mbox = '_____TestMailboxTest';
+    private static $test_mbox_utf8 = '_____TestMailboxTest1è';
 
     public static function setUpBeforeClass()
     {
         $c = array_shift(self::$config);
 
         self::$created = false;
-        self::$test_mbox = $c['test_mbox'];
-        self::$test_mbox_utf8 = $c['test_mbox_utf8'];
+        if (isset($c['test_mbox'])) {
+            self::$test_mbox = $c['test_mbox'];
+        }
+        if (isset($c['test_mbox_utf8'])) {
+            self::$test_mbox_utf8 = $c['test_mbox_utf8'];
+        }
 
         try {
             $c['client_config']['cache'] = array(

diff --git a/framework/Imap_Client/test/Horde/Imap/Client/conf.php.dist b/framework/Imap_Client/test/Horde/Imap/Client/conf.php.dist
@@ -15,8 +15,6 @@ $conf['imapclient'] = array(
             // Test for XOAUTH2
             //'xoauth2_token' => ''
         ),
-        'test_mbox' => 'TestMailboxTest',
-        'test_mbox_utf8' => 'TestMailboxTest1è',
 
         // Configuration for the Mongo cache driver test.
         // Format: mongodb://[username:password@]host