x/monasca-vagrant
Code Issues Proposed changes

fixed error when statsd metrics have not yet arrived during test initialization

Browse Source 
Change-Id: I3158bb52c7d6f8116e1f17b5f0a4768cceb52e3d
This commit is contained in:
Ryan Brandt
2015-01-30 13:32:15 -07:00
parent edfe3aa0d3
commit a828507a22
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/smoke.py
View File

@@ -177,8 +177,13 @@ def smoke_test():
metric_name, metric_dimensions))
return False, msg
print('Getting metrics for {}{} '.format(statsd_metric_name, statsd_metric_dimensions))
initial_statsd_num_metrics = count_metrics(statsd_metric_name, statsd_metric_dimensions, hour_ago_str)
# statsd metrics may not have been sent yet, which will return None from the CLI wrapper
if initial_statsd_num_metrics is None:
initial_statsd_num_metrics = 0
start_time = time.time()
# Create Notification through CLI
@@ -276,7 +281,7 @@ def smoke_test():
final_statsd_num_metrics = count_metrics(statsd_metric_name, statsd_metric_dimensions, hour_ago_str)
if final_statsd_num_metrics > initial_statsd_num_metrics:
break
if x >= 30:
if x >= 29:
msg = 'No metrics received for statsd metric {}{} in {} seconds'.format(
statsd_metric_name, statsd_metric_dimensions, x)
return False, msg