Merge branch 'prep-release-3.2.4' into 3.2.x

1 files changed, 0 insertions, 96 deletions

diff --git a/tests/functions_acp/validate_config_vars_test.php b/tests/functions_acp/validate_config_vars_test.php
index 5c31888291..1182d659f0 100644
--- a/tests/functions_acp/validate_config_vars_test.php
+++ b/tests/functions_acp/validate_config_vars_test.php
@@ -161,100 +161,4 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
 
 		$this->assertEquals($expected, $phpbb_error);
 	}
-
-	public function data_validate_path_linux()
-	{
-		return array(
-			array('/usr/bin', 'absolute_path', true),
-			array('/usr/bin/', 'absolute_path:50:200', true),
-			array('/usr/bin/which', 'absolute_path', 'DIRECTORY_NOT_DIR'),
-			array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			array('C:\Windows', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			array('.', 'absolute_path', true),
-			array('', 'absolute_path', true),
-			array('mkdir /foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			// Make sure above command didn't do anything
-			array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-		);
-	}
-
-	/**
-	 * @dataProvider data_validate_path_linux
-	 */
-	public function test_validate_path_linux($path, $validation_type, $expected)
-	{
-		if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')
-		{
-			$this->markTestSkipped('Unable to test linux specific paths on other OS.');
-		}
-
-		$error = array();
-		$config_ary = array(
-			'path' => $path,
-		);
-
-		validate_config_vars(array(
-				'path'	=> array('lang' => 'FOOBAR', 'validate' => $validation_type),
-			),
-			$config_ary,
-			$error
-		);
-
-		if ($expected === true)
-		{
-			$this->assertEmpty($error);
-		}
-		else
-		{
-			$this->assertEquals(array($expected), $error);
-		}
-	}
-
-	public function data_validate_path_windows()
-	{
-		return array(
-			array('C:\Windows', 'absolute_path', true),
-			array('C:\Windows\\', 'absolute_path:50:200', true),
-			array('C:\Windows\explorer.exe', 'absolute_path', 'DIRECTORY_NOT_DIR'),
-			array('C:\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			array('/usr/bin', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			array('.', 'absolute_path', true),
-			array('', 'absolute_path', true),
-			array('mkdir C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-			// Make sure above command didn't do anything
-			array('C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
-		);
-	}
-
-	/**
-	 * @dataProvider data_validate_path_windows
-	 */
-	public function test_validate_path_windows($path, $validation_type, $expected)
-	{
-		if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')
-		{
-			$this->markTestSkipped('Unable to test windows specific paths on other OS.');
-		}
-
-		$error = array();
-		$config_ary = array(
-			'path' => $path,
-		);
-
-		validate_config_vars(array(
-			'path'	=> array('lang' => 'FOOBAR', 'validate' => $validation_type),
-		),
-			$config_ary,
-			$error
-		);
-
-		if ($expected === true)
-		{
-			$this->assertEmpty($error);
-		}
-		else
-		{
-			$this->assertEquals(array($expected), $error);
-		}
-	}
 }