aboutsummaryrefslogtreecommitdiffstats
path: root/services/database
diff options
context:
space:
mode:
authorEdan Binshtok <eb578m@intl.att.com>2017-10-18 07:56:58 +0300
committerEdan Binshtok <eb578m@intl.att.com>2017-10-18 07:56:58 +0300
commit433a8256e31f755f5e236491bbe39d3db24d6d6d (patch)
tree45f483eab1ea1654ee21a3b51c5b8bf1a8ebaffa /services/database
parentf8907f0c4fc0ba4bb97a1d636a50c5b40c2642f2 (diff)
Align CI test test and JJB
Add vendor agnostic CI test to align Add Tox and maven docker Issue Id: VVP-15 Change-Id: I69f0c1036e6f72b62bddc822544c55200af7b37d Signed-off-by: Edan Binshtok <eb578m@intl.att.com>
Diffstat (limited to 'services/database')
-rw-r--r--services/database/db_checklist.py18
1 files changed, 11 insertions, 7 deletions
diff --git a/services/database/db_checklist.py b/services/database/db_checklist.py
index 15851cf..04f8a44 100644
--- a/services/database/db_checklist.py
+++ b/services/database/db_checklist.py
@@ -1,5 +1,5 @@
-
-# ============LICENSE_START==========================================
+
+# ============LICENSE_START==========================================
# org.onap.vvp/test-engine
# ===================================================================
# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
@@ -50,6 +50,7 @@ from services.session import session
logger = LoggingServiceFactory.get_logger()
+
class DBChecklist:
@staticmethod
@@ -361,16 +362,18 @@ class DBChecklist:
@staticmethod
def state_changed(identify_field, field_value, expected_state):
- get_state = str(DBGeneral.select_where(
- "state", Constants.DBConstants.IceTables.CHECKLIST, identify_field, field_value, 1))
+ get_state = DBGeneral.select_where_order_by_desc(
+ "state", Constants.DBConstants.IceTables.CHECKLIST,
+ identify_field, field_value, "create_time")[0]
counter = 0
while get_state != expected_state and counter <= Constants.DBConstants.RETRIES_NUMBER:
time.sleep(session.wait_until_time_pause_long)
logger.debug("Checklist state not changed yet , expecting state: %s, current result: %s (attempt %s of %s)" % (
expected_state, get_state, counter, Constants.DBConstants.RETRIES_NUMBER))
counter += 1
- get_state = str(DBGeneral.select_where(
- "state", Constants.DBConstants.IceTables.CHECKLIST, identify_field, field_value, 1))
+ get_state = DBGeneral.select_where_order_by_desc(
+ "state", Constants.DBConstants.IceTables.CHECKLIST,
+ identify_field, field_value, "create_time")[0]
if get_state == expected_state:
logger.debug("Checklist state was successfully changed into: " +
@@ -382,5 +385,6 @@ class DBChecklist:
@staticmethod
def get_recent_checklist_uuid(name):
required_uuid = DBGeneral.select_where_not_and_order_by_desc(
- 'uuid', Constants.DBConstants.IceTables.CHECKLIST, 'name', name, 'state', Constants.ChecklistStates.Archive.TEXT, 'create_time')
+ 'uuid', Constants.DBConstants.IceTables.CHECKLIST, 'name', name,
+ 'state', Constants.ChecklistStates.Archive.TEXT, 'create_time')
return required_uuid