Development

Changeset 10993

You must first sign up to be able to contribute.

Changeset 10993

Show
Ignore:
Timestamp:
08/20/08 10:55:01 (11 months ago)
Author:
dwhittle
Message:

1.2: tweaked test bootstrap cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.2/test/bootstrap/functional.php

    r7962 r10993  
    1010 
    1111// setup expected test environment (per check_configuration.php) 
    12 ini_set('magic_quotes_gpc', 'off'); 
     12ini_set('magic_quotes_runtime', 'off'); 
    1313ini_set('register_globals', 'off'); 
    1414ini_set('session.auto_start', 'off'); 
    15 ini_set('arg.output_separator', '&'); 
    16  
     15ini_set('arg_separator.output', '&'); 
    1716ini_set('allow_url_fopen', 'on'); 
    1817 
     
    2423require_once $root_dir.'/config/ProjectConfiguration.class.php'; 
    2524$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true); 
     25 
    2626sfContext::createInstance($configuration); 
    2727 
     
    3535  sfToolkit::clearDirectory(sfConfig::get('sf_cache_dir')); 
    3636  sfToolkit::clearDirectory(sfConfig::get('sf_log_dir')); 
     37 
     38  $sf_root_dir = sfToolkit::getTmpDir().'/sf_test_project'; 
     39  if(is_dir($sf_root_dir)) 
     40  { 
     41    sfToolkit::clearDirectory($sf_root_dir); 
     42    @rmdir($sf_root_dir); 
     43  } 
     44 
     45  $sessions = glob(sfToolkit::getTmpDir().'/sessions*'); 
     46  $tmp_files = glob(sfToolkit::getTmpDir().'/sf*'); 
     47  $files = array_merge(empty($sessions) ? array() : $sessions, empty($tmp_files) ? array() : $tmp_files); 
     48  foreach ($files as $file) 
     49  { 
     50    if(is_dir($file)) 
     51    { 
     52      sfToolkit::clearDirectory($file); 
     53      @rmdir($file); 
     54    } 
     55    else 
     56    { 
     57      @unlink($file); 
     58    } 
     59  } 
    3760} 
    3861 
  • branches/1.2/test/bootstrap/unit.php

    r7432 r10993  
    1010 
    1111// setup expected test environment (per check_configuration.php) 
    12 ini_set('magic_quotes_gpc', 'off'); 
     12ini_set('magic_quotes_runtime', 'off'); 
    1313ini_set('register_globals', 'off'); 
    1414ini_set('session.auto_start', 'off'); 
    15 ini_set('arg.output_separator', '&'); 
    16  
     15ini_set('arg_separator.output', '&'); 
    1716ini_set('allow_url_fopen', 'on'); 
    1817 
     
    2625 
    2726require_once(dirname(__FILE__).'/../../lib/util/sfToolkit.class.php'); 
    28 sfConfig::set('sf_test_cache_dir', sfToolkit::getTmpDir()); 
     27sfConfig::set('sf_test_cache_dir', sfToolkit::getTmpDir().'/sf_test_project'); 
     28 
     29// remove all test cache 
     30sf_unit_test_shutdown(); 
     31 
     32// create test cache dir 
     33$sf_root_dir = sfToolkit::getTmpDir().'/sf_test_project'; 
     34mkdir($sf_root_dir, 0777, true); 
     35 
     36register_shutdown_function('sf_unit_test_shutdown'); 
     37 
     38function sf_unit_test_shutdown() 
     39
     40  $sf_root_dir = sfToolkit::getTmpDir().'/sf_test_project'; 
     41  if(is_dir($sf_root_dir)) 
     42  { 
     43    sfToolkit::clearDirectory($sf_root_dir); 
     44    @rmdir($sf_root_dir); 
     45  } 
     46 
     47  $sessions = glob(sfToolkit::getTmpDir().'/sessions*'); 
     48  $tmp_files = glob(sfToolkit::getTmpDir().'/sf*'); 
     49 
     50  $files = array_merge((empty($sessions) ? array() : $sessions), (empty($tmp_files) ? array() : $tmp_files)); 
     51  foreach ($files as $file) 
     52  { 
     53    if(is_dir($file)) 
     54    { 
     55      sfToolkit::clearDirectory($file); 
     56      @rmdir($file); 
     57    } 
     58    else 
     59    { 
     60      @unlink($file); 
     61    } 
     62  } 
     63

The Sensio Labs Network

Since 1998, Sensio Labs has been promoting the Open-Source software movement by providing quality web application development, training, consulting, and supporting several large Open-Source projects.