Commit 0932aade authored by Xavier Thompson's avatar Xavier Thompson

promise: Remove obsolete legacy code

parent a948dbfa
...@@ -41,8 +41,6 @@ import six ...@@ -41,8 +41,6 @@ import six
from six import PY3, with_metaclass from six import PY3, with_metaclass
from datetime import datetime, timedelta from datetime import datetime, timedelta
from pkg_resources import parse_version
PROMISE_STATE_FOLDER_NAME = '.slapgrid/promise' PROMISE_STATE_FOLDER_NAME = '.slapgrid/promise'
PROMISE_RESULT_FOLDER_NAME = '.slapgrid/promise/result' PROMISE_RESULT_FOLDER_NAME = '.slapgrid/promise/result'
PROMISE_LOG_FOLDER_NAME = '.slapgrid/promise/log' PROMISE_LOG_FOLDER_NAME = '.slapgrid/promise/log'
...@@ -496,12 +494,7 @@ class GenericPromise(with_metaclass(ABCMeta, object)): ...@@ -496,12 +494,7 @@ class GenericPromise(with_metaclass(ABCMeta, object)):
elif (not self.__is_tested and not check_anomaly) or \ elif (not self.__is_tested and not check_anomaly) or \
(not self.__is_anomaly_detected and check_anomaly): (not self.__is_anomaly_detected and check_anomaly):
# Anomaly or Test is disabled on this promise, send empty # Anomaly or Test is disabled on this promise, send empty
slapgrid_version = self.getConfig('slapgrid-version', '') self.__sendResult(PromiseQueueResult())
if parse_version(slapgrid_version) <= parse_version('1.4.17'):
# old version cannot send EmptyResult
self.__sendResult(PromiseQueueResult(item=TestResult()))
else:
self.__sendResult(PromiseQueueResult())
else: else:
try: try:
self.sense() self.sense()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment