X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=baro_tests%2Ftests.py;h=5400510f75ce5a22f9a4d905062b0c55d838e6d5;hb=HEAD;hp=4cbd0e87895f927b9a61012f18925c18e4a982fe;hpb=1ec9c3828ef6b1c0426b14138cc9b3a24cf88122;p=barometer.git

diff --git a/baro_tests/tests.py b/baro_tests/tests.py
index 4cbd0e87..5400510f 100644
--- a/baro_tests/tests.py
+++ b/baro_tests/tests.py
@@ -1,20 +1,24 @@
 # -*- coding: utf-8 -*-
-
+#
+# Copyright(c) 2017-2019 Intel Corporation and OPNFV. All rights reserved.
+#
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
 # a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+#
 
 """Function for testing collectd plug-ins with different oup plug-ins"""
 
 import time
+import math
 
 
 def test_snmp_sends_data(
@@ -223,7 +227,9 @@ def test_csv_handles_plugin_data(
         + 'to interval...')
     for metric in plugin_metrics:
         logger.debug('{0} {1} {2} ... '.format(metric[0], metric[1], metric[2]))
-        if metric[3] - metric[2] != interval:
+        # When there's a small interval or many metrics, there may be a slight
+        # delay in writing the metrics. e.g. a gap of 1.* is okay for an interval of 1
+        if math.floor(metric[3] - metric[2]) > interval + 1:
             logger.error(
                 'Time of last two entries differ by '
                 + '{}, but interval is {}'.format(
@@ -267,3 +273,15 @@ def test_csv_handles_plugin_data(
     logger.info('OK')
 
     return True
+
+
+def test_dma_server_set_collectd(compute, file, logger, client):
+    with open(file, mode='w') as f:
+        f.write('# dummy conf\n')
+    res = client.set(file)
+    if res:
+        logger.info('set collectd PASS')
+    else:
+        logger.error('set collectd FAIL')
+
+    return res