From: Jozef Behran <jbehran@cisco.com>
Date: Thu, 28 Jan 2016 10:17:05 +0000 (+0100)
Subject: Fix "Variable not found" in Netconf scaling test
X-Git-Tag: release/beryllium-sr1~176
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=4b3794eac50efc63f88af84c441a1d03ca3d75a3

Fix "Variable not found" in Netconf scaling test

The commit 6acfed01ccc4bf0ce66688bb9d0b51beda5a2265 removed
the ENABLE_GLOBAL_TEST_DEADLINES, causing the Netconf scaling
tests to fail with "Variable ${ENABLE_NETCONF_TEST_TIMEOUT}
not found". Revert that bogus change.

Change-Id: I8b305bbd126aa9fde2294cc5219a502f26067145
Signed-off-by: Jozef Behran <jbehran@cisco.com>
---

diff --git a/csit/variables/Variables.py b/csit/variables/Variables.py
index 8c1840bfa4..de3ad9735e 100644
--- a/csit/variables/Variables.py
+++ b/csit/variables/Variables.py
@@ -186,6 +186,9 @@ CONTROLLER_STOP_TIMEOUT = 120  # Max number of seconds test will wait for a cont
 TOPOLOGY_URL = 'network-topology:network-topology/topology'
 SEND_ACCEPT_XML_HEADERS = {'Content-Type': 'application/xml', 'Accept': 'application/xml'}
 
+# Test deadlines global control
+ENABLE_GLOBAL_TEST_DEADLINES = True
+
 # Deprecated old variables, to be removed once all tests that need them are
 # updated to use the new names.
 CONTROLLER = ODL_SYSTEM_IP