pts-core: Remove DownloadSize tag that was deprecated from the test

profiles since PTS 1.4

2 files changed, 3 insertions, 14 deletions

diff --git a/pts-core/functions/pts-functions_tests.php b/pts-core/functions/pts-functions_tests.php
index bd4e270..f96aae0 100644
--- a/pts-core/functions/pts-functions_tests.php
+++ b/pts-core/functions/pts-functions_tests.php
@@ -433,20 +433,10 @@ function pts_estimated_download_size($identifier)
 	$estimated_size = 0;
 	foreach(pts_contained_tests($identifier, true) as $test)
 	{
-	 	$xml_parser = new pts_test_tandem_XmlReader(pts_location_test($test));
-		$this_size = $xml_parser->getXMLValue(P_TEST_DOWNLOADSIZE); // TODO: The DownloadSize tag has been deprecates as of Phoronix Test Suite 1.4.0
-
-		if(!empty($this_size) && is_numeric($this_size))
-		{
-			$estimated_size += $this_size;
-		}
-		else
+		// The work for calculating the download size in 1.4.0+
+		foreach(pts_objects_test_downloads($test) as $download_object)
 		{
-			// The work for calculating the download size in 1.4.0+
-			foreach(pts_objects_test_downloads($test) as $download_object)
-			{
-				$estimated_size += pts_trim_double($download_object->get_filesize() / 1048576);
-			}
+			$estimated_size += pts_trim_double($download_object->get_filesize() / 1048576);
 		}
 	}
 
diff --git a/pts-core/functions/pts-interfaces.php b/pts-core/functions/pts-interfaces.php
index 5a0a745..21df029 100644
--- a/pts-core/functions/pts-interfaces.php
+++ b/pts-core/functions/pts-interfaces.php
@@ -53,7 +53,6 @@ define("P_TEST_UNSUPPORTEDPLATFORMS", "PhoronixTestSuite/TestProfile/Unsupported
 define("P_TEST_EXDEP", "PhoronixTestSuite/TestProfile/ExternalDependencies"); // Test external dependencies
 define("P_TEST_CTPEXTENDS", "PhoronixTestSuite/TestProfile/Extends"); // Does this test profile extend another test? (Cascading Test Profiles)
 define("P_TEST_ROOTNEEDED", "PhoronixTestSuite/TestProfile/RequiresRoot"); // Is root access needed? If set to "TRUE"
-define("P_TEST_DOWNLOADSIZE", "PhoronixTestSuite/TestProfile/DownloadSize"); // Estimated size of capacity needed for downloads (in MB)
 define("P_TEST_ENVIRONMENTSIZE", "PhoronixTestSuite/TestProfile/EnvironmentSize"); // Estimated size of capacity needed for testing environment (in MB)
 define("P_TEST_ESTIMATEDTIME", "PhoronixTestSuite/TestProfile/EstimatedLength"); // Estimated length of time it takes the test to complete (in minutes)
 define("P_TEST_PROJECTURL", "PhoronixTestSuite/TestProfile/ProjectURL"); // Estimated length of time it takes the test to complete (in minutes)