1
=== modified file 'drizzle/automation/lcov/run.py'
2
--- drizzle/automation/lcov/run.py	2010-01-05 19:23:09 +0000
3
+++ drizzle/automation/lcov/run.py	2010-01-14 17:40:22 +0000
4
@@ -28,11 +28,72 @@
5
28
28
6
29
import sys
29
import sys
7
30
import os
30
import os
8
31
import re
9
31
import os.path
32
import os.path
10
32
from drizzle.automation.lib  import logging
33
from drizzle.automation.lib  import logging
11
33
import commands
34
import commands
12
34
import datetime
35
import datetime
13
35
36
14
37
# in the lcov/index.html file look for the total percentage of the
15
38
# top level directories (drizzled, client), except plugin which is processed differently
16
39
def find_coverage_percentage(dir, file_name):
17
40
  fileHandle= open(file_name).read()
18
41
  pattern= "href=\"%s/index.html\"" % dir
19
42
  pos= fileHandle.find(pattern)
20
43
21
44
  if pos > 0:
22
45
    float_pattern= "alt=\""
23
46
    new_pos= fileHandle.find(float_pattern, pos)
24
47
    if new_pos:
25
48
      new_pos= new_pos + 5 # length of alt="
26
49
      end_pos= new_pos + 1
27
50
      while fileHandle[end_pos].isdigit() or fileHandle[end_pos] == '.':
28
51
        end_pos= end_pos + 1
29
52
      percentage= float(fileHandle[new_pos:end_pos])
30
53
  else:
31
54
    percentage= 0.0
32
55
 
33
56
  #fileHandle.close()
34
57
  return percentage
35
58
36
59
# Because plugin does not have files in its root directory
37
60
# we need to find all the index.html files in the plugin
38
61
# directory and get the percent coverage for each and 
39
62
# add to a grand total divided by total count of plugin index.html files
40
63
def find_coverage_percentage_for_plugin_dir(file_name):
41
64
  fileHandle= open(file_name)
42
65
  pattern= re.compile('href="plugin/\w+/*\w*/index.html"')
43
66
  float_pattern= re.compile('alt="')
44
67
45
68
  inlines= fileHandle.readlines()
46
69
  found= 0
47
70
  counter=0
48
71
  total=0
49
72
  for inline in inlines:
50
73
    # first find a line to matches pattern, which will be something like:
51
74
    #       href="plugin/ascii/index.html
52
75
    if not found:
53
76
      first_pos= pattern.search(inline)
54
77
      if (first_pos):
55
78
        found= 1
56
79
     # once we have found pattern, now get the next line that has float_pattern
57
80
     # and look for the percent coverage number for this plugin directory
58
81
     # it is found right after the float_pattern
59
82
    if found:
60
83
      next_pattern= float_pattern.search(inline)
61
84
      if (next_pattern):
62
85
        begin_position = next_pattern.end()
63
86
        end_position = begin_position + 1
64
87
        while inline[end_position].isdigit() or inline[end_position] == '.':
65
88
          end_position= end_position + 1
66
89
        dir_percent= float(inline[begin_position:end_position])
67
90
        total= total + dir_percent
68
91
        counter = counter + 1
69
92
        found= 0
70
93
71
94
  fileHandle.close()
72
95
  return total/counter
73
96
74
36
# print out failing tests if we encounter test failures
97
# print out failing tests if we encounter test failures
75
37
def check_test_suite_logs():
98
def check_test_suite_logs():
76
38
  infilename= "tests/var/log/drizzle-test-run.log"
99
  infilename= "tests/var/log/drizzle-test-run.log"
77
@@ -83,7 +144,7 @@
78
83
  outf.close()
144
  outf.close()
79
84
  os.rename(outfilename, infilename)
145
  os.rename(outfilename, infilename)
80
85
146
82
86
# Need to munge the string for some files in the plugin directory
147
# Need to munge the string for some files in the plugin and drizzled directory
83
87
# as gcov can't find the source file and thus assumes incorrectly
148
# as gcov can't find the source file and thus assumes incorrectly
84
88
# that it is in the root directory. So we need to add the missing path
149
# that it is in the root directory. So we need to add the missing path
85
89
# to the directory string
150
# to the directory string
86
@@ -243,24 +304,16 @@
87
243
    lcov_dirs= variables['lcov']['directories'].split(',')
304
    lcov_dirs= variables['lcov']['directories'].split(',')
88
244
305
89
245
    # Grab our index file for the lcov reports
306
    # Grab our index file for the lcov reports
90
246
    index_file_contents= open("%s/%s/index.html" % (working_dir, output_dir)).read()
91
247
    for dir in lcov_dirs:
307
    for dir in lcov_dirs:
92
248
308
106
249
      pattern= "href=\"%s/index.html\"" % dir
309
      file_name= "%s/%s/index.html" % (working_dir, output_dir)
107
250
      pos= index_file_contents.find(pattern)
310
       # in the lcov/index.html file look for the total percentage of the
108
251
    
311
       # top level directories (drizzled, client), except plugin which is processed differently
109
252
      if pos > 0:
312
       # since there are multiple entries in the file for plugin percentages
110
253
        float_pattern= "alt=\""
313
      if dir == 'plugin':
111
254
        new_pos= index_file_contents.find(float_pattern, pos)
314
        percentages[dir]= find_coverage_percentage_for_plugin_dir(file_name)
99
255
        if new_pos:
100
256
          new_pos= new_pos + 5 # length of alt="
101
257
          end_pos= new_pos + 1
102
258
          while index_file_contents[end_pos].isdigit() or index_file_contents[end_pos] == '.':
103
259
            end_pos= end_pos + 1
104
260
          dir_percent= float(index_file_contents[new_pos:end_pos])
105
261
          percentages[dir]= dir_percent
112
262
      else:
315
      else:
114
263
        percentages[dir]= 0.0
316
        percentages[dir]= find_coverage_percentage(dir, file_name)
115
264
317
116
265
    # Insert into the DB...
318
    # Insert into the DB...
117
266
    for dir in lcov_dirs:
319
    for dir in lcov_dirs:
118
@@ -273,3 +326,5 @@
119
273
      db.execute_sql(sql)
326
      db.execute_sql(sql)
120
274
327
121
275
  return True
328
  return True
122
329
123
330
Status:	Merged
Merged at revision:	not available
Proposed branch:	lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/lcov-plugin-fix
Merge into:	lp://qastaging/drizzle-automation
Diff against target:	123 lines (+71/-16) 1 file modified drizzle/automation/lcov/run.py (+71/-16)
To merge this branch:	bzr merge lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/lcov-plugin-fix
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Jay Pipes		2010-01-14	Approve on 2010-01-14
Review via email: mp+17397@code.qastaging.launchpad.net