From 83de7401162dc895ae8343a2e43f2c9eb57afb06 Mon Sep 17 00:00:00 2001
From: Alex Shatov <alexs@att.com>
Date: Thu, 24 May 2018 16:41:24 -0400
Subject: 2.4.5 policy-handler - fix of unit tests

- turned off test_gc unit-test on policy-handler to avoid
  get /gc/stats after shutdown of the web-server
- made rougher comparison between execution time and timer interval

Change-Id: Idcf6caae6f2a934dc2dc2d5a0fddd06543abd48a
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-532
---
 pom.xml                     | 2 +-
 setup.py                    | 2 +-
 tests/test_policyhandler.py | 5 ++++-
 tests/test_step_timer.py    | 2 +-
 version.properties          | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0484790..a1cd002 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.platform</groupId>
   <artifactId>policy-handler</artifactId>
   <name>dcaegen2-platform-policy-handler</name>
-  <version>2.4.4-SNAPSHOT</version>
+  <version>2.4.5-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/setup.py b/setup.py
index 33011e9..55ca797 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ from setuptools import setup
 setup(
     name='policyhandler',
     description='DCAE-Controller policy-handler to communicate with policy-engine',
-    version="2.4.4",
+    version="2.4.5",
     author='Alex Shatov',
     packages=['policyhandler'],
     zip_safe=False,
diff --git a/tests/test_policyhandler.py b/tests/test_policyhandler.py
index f2dd9eb..a775ea7 100644
--- a/tests/test_policyhandler.py
+++ b/tests/test_policyhandler.py
@@ -46,7 +46,6 @@ from policyhandler.web_server import _PolicyWeb
 
 from .mock_settings import Settings
 
-
 Settings.init()
 
 class MonkeyHttpResponse(object):
@@ -603,6 +602,7 @@ class WebServerTest(CPWebCase):
         result = self.getPage("/healthcheck")
         Settings.logger.info("healthcheck result: %s", result)
 
+        WebServerTest.do_gc_test = False
         Settings.logger.info("shutdown...")
         result = self.getPage("/shutdown")
         Settings.logger.info("shutdown result: %s", result)
@@ -610,6 +610,7 @@ class WebServerTest(CPWebCase):
         Settings.logger.info("got shutdown: %s", self.body)
         time.sleep(1)
 
+
 @pytest.mark.usefixtures("fix_pdp_post_boom")
 class WebServerPDPBoomTest(CPWebCase):
     """testing the web-server - runs tests in alphabetical order of method names"""
@@ -761,6 +762,7 @@ class WebServerPDPBoomTest(CPWebCase):
         result = self.getPage("/healthcheck")
         Settings.logger.info("healthcheck result: %s", result)
 
+        WebServerPDPBoomTest.do_gc_test = False
         Settings.logger.info("shutdown...")
         result = self.getPage("/shutdown")
         Settings.logger.info("shutdown result: %s", result)
@@ -920,6 +922,7 @@ class WebServerInternalBoomTest(CPWebCase):
         result = self.getPage("/healthcheck")
         Settings.logger.info("healthcheck result: %s", result)
 
+        WebServerInternalBoomTest.do_gc_test = False
         Settings.logger.info("shutdown...")
         result = self.getPage("/shutdown")
         Settings.logger.info("shutdown result: %s", result)
diff --git a/tests/test_step_timer.py b/tests/test_step_timer.py
index 808f99e..ff89388 100644
--- a/tests/test_step_timer.py
+++ b/tests/test_step_timer.py
@@ -80,7 +80,7 @@ class MockTimerController(object):
 
         MockTimerController.logger.info("verify exe %s for %s",
                                         self.exe_interval, self.get_status())
-        assert self.exe_interval >= self.interval
+        assert self.exe_interval >= (self.interval - 0.01)
         assert self.exe_interval < 2 * self.interval
         MockTimerController.logger.info("success %s", self.get_status())
 
diff --git a/version.properties b/version.properties
index 9282bc9..78a46ab 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=2
 minor=4
-patch=4
+patch=5
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg