diff options
Diffstat (limited to 'modules/simpletest/tests')
| -rw-r--r-- | modules/simpletest/tests/common.test | 8 | ||||
| -rw-r--r-- | modules/simpletest/tests/file.test | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/modules/simpletest/tests/common.test b/modules/simpletest/tests/common.test index b2223d579..35a2a7f87 100644 --- a/modules/simpletest/tests/common.test +++ b/modules/simpletest/tests/common.test @@ -801,8 +801,8 @@ class DrupalHTTPRequestTestCase extends DrupalWebTestCase { // Parse URL schema. $missing_scheme = drupal_http_request('example.com/path'); - $this->assertEqual($missing_scheme->code, -1001, t('Returned with "-1001" error code.')); - $this->assertEqual($missing_scheme->error, 'unable to parse URL', t('Returned with "unable to parse URL" error message.')); + $this->assertEqual($missing_scheme->code, -1002, t('Returned with "-1002" error code.')); + $this->assertEqual($missing_scheme->error, 'missing schema', t('Returned with "missing schema" error message.')); $unable_to_parse = drupal_http_request('http:///path'); $this->assertEqual($unable_to_parse->code, -1001, t('Returned with "-1001" error code.')); @@ -860,8 +860,8 @@ class DrupalHTTPRequestTestCase extends DrupalWebTestCase { $this->assertFalse(isset($redirect_301->redirect_code), t('drupal_http_request does not follow 301 redirect if max_redirects = 0.')); $redirect_invalid = drupal_http_request(url('system-test/redirect-noscheme', array('absolute' => TRUE)), array('max_redirects' => 1)); - $this->assertEqual($redirect_invalid->code, -1001, t('301 redirect to invalid URL returned with error code !error.', array('!error' => $redirect_invalid->error))); - $this->assertEqual($redirect_invalid->error, 'unable to parse URL', t('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error))); + $this->assertEqual($redirect_invalid->code, -1002, t('301 redirect to invalid URL returned with error code !error.', array('!error' => $redirect_invalid->error))); + $this->assertEqual($redirect_invalid->error, 'missing schema', t('301 redirect to invalid URL returned with error message "!error".', array('!error' => $redirect_invalid->error))); $redirect_invalid = drupal_http_request(url('system-test/redirect-noparse', array('absolute' => TRUE)), array('max_redirects' => 1)); $this->assertEqual($redirect_invalid->code, -1001, t('301 redirect to invalid URL returned with error message code "!error".', array('!error' => $redirect_invalid->error))); diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test index 08263668c..051d57889 100644 --- a/modules/simpletest/tests/file.test +++ b/modules/simpletest/tests/file.test @@ -728,9 +728,7 @@ class FileDirectoryTest extends FileTestCase { // Remove .htaccess file to then test that it gets re-created. $directory = file_directory_path(); - if (file_exists($directory . '/.htaccess')) { - unlink($directory . '/.htaccess'); - } + @unlink($directory . '/.htaccess'); $this->assertFalse(is_file($directory . '/.htaccess'), t('Successfully removed the .htaccess file in the files directory.'), 'File'); file_ensure_htaccess(); $this->assertTrue(is_file($directory . '/.htaccess'), t('Successfully re-created the .htaccess file in the files directory.'), 'File'); |