Remove report count limit

framework/python/src/common/session.py

@@ -27,7 +27,6 @@
 LOG_LEVEL_KEY = 'log_level'
 API_URL_KEY = 'api_url'
 API_PORT_KEY = 'api_port'
-MAX_DEVICE_REPORTS_KEY = 'max_device_reports'
 
 LOGGER = logger.get_logger('session')
 
@@ -90,7 +89,6 @@ def _get_default_config(self):
       'log_level': 'INFO',
       'startup_timeout': 60,
       'monitor_period': 30,
-      'max_device_reports': 5,
       'api_url': 'http://localhost',
       'api_port': 8000
     }
@@ -135,10 +133,6 @@ def _load_config(self):
       if API_PORT_KEY in config_file_json:
         self._config[API_PORT_KEY] = config_file_json.get(API_PORT_KEY)
 
-      if MAX_DEVICE_REPORTS_KEY in config_file_json:
-        self._config[MAX_DEVICE_REPORTS_KEY] = config_file_json.get(
-          MAX_DEVICE_REPORTS_KEY)
-
       LOGGER.debug(self._config)
 
   def _load_version(self):
@@ -185,9 +179,6 @@ def get_api_url(self):
   def get_api_port(self):
     return self._config.get(API_PORT_KEY)
 
-  def get_max_device_reports(self):
-    return self._config.get(MAX_DEVICE_REPORTS_KEY)
-
   def set_config(self, config_json):
     self._config.update(config_json)
     self._save_config()

framework/python/src/test_orc/test_orchestrator.py

@@ -128,11 +128,6 @@ def run_test_modules(self):
     # Archive the runtime directory
     self._zip_results(timestamp_dir)
 
-    LOGGER.debug("Cleaning old test results...")
-    self._cleanup_old_test_results(device)
-
-    LOGGER.debug("Old test results cleaned")
-
     return report.get_status()
 
   def _write_reports(self, test_report):
@@ -183,54 +178,6 @@ def _calculate_result(self):
         result = "Non-Compliant"
     return result
 
-  def _cleanup_old_test_results(self, device):
-
-    if device.max_device_reports is not None:
-      max_device_reports = device.max_device_reports
-    else:
-      max_device_reports = self._session.get_max_device_reports()
-
-    completed_results_dir = os.path.join(
-        self._root_path,
-        LOCAL_DEVICE_REPORTS.replace("{device_folder}", device.device_folder))
-
-    completed_tests = os.listdir(completed_results_dir)
-    cur_test_count = len(completed_tests)
-    if cur_test_count > max_device_reports:
-      LOGGER.debug("Current device has more than max tests results allowed: " +
-                   str(cur_test_count) + ">" + str(max_device_reports))
-
-      # Find and delete the oldest test
-      oldest_test = self._find_oldest_test(completed_results_dir)
-      if oldest_test is not None:
-        LOGGER.debug("Oldest test found, removing: " + str(oldest_test[1]))
-        shutil.rmtree(oldest_test[1], ignore_errors=True)
-
-        # Remove oldest test from session
-        oldest_timestamp = oldest_test[0]
-        self.get_session().get_target_device().remove_report(oldest_timestamp)
-
-        # Confirm the delete was succesful
-        new_test_count = len(os.listdir(completed_results_dir))
-        if (new_test_count != cur_test_count
-            and new_test_count > max_device_reports):
-          # Continue cleaning up until we're under the max
-          self._cleanup_old_test_results(device)
-
-  def _find_oldest_test(self, completed_tests_dir):
-    oldest_timestamp = None
-    oldest_directory = None
-    for completed_test in os.listdir(completed_tests_dir):
-      timestamp = datetime.strptime(str(completed_test), "%Y-%m-%dT%H:%M:%S")
-      if oldest_timestamp is None or timestamp < oldest_timestamp:
-        oldest_timestamp = timestamp
-        oldest_directory = completed_test
-    if oldest_directory:
-      return oldest_timestamp, os.path.join(completed_tests_dir,
-                                            oldest_directory)
-    else:
-      return None
-
   def _timestamp_results(self, device):
 
     # Define the current device results directory

local/system.json.example

@@ -5,6 +5,5 @@
   },
   "log_level": "INFO",
   "startup_timeout": 60,
-  "monitor_period": 300,
-  "max_device_reports": 5
+  "monitor_period": 300
 }