← Back to branch summary

~ubuntu-branches/ubuntu/trusty/syslog-ng/trusty-proposed

« back to all changes in this revision

Viewing changes to tests/functional/messagecheck.py

  • Committer: Bazaar Package Importer
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2010-03-28 19:47:36 UTC
  • mfrom: (1.3.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100328194736-1ob7kh1qr0fy8b9k
Tags: 3.1.0-1
http://bugs.debian.org/575722
http://bugs.debian.org/575723
* New upstream release.
* Fix path of syslog logfile (closes: #575722) and use tty10 instead of
  vc/10 to log on console.
* Provide syslog-ng in initscript (closes: #575723).

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/functional/messagecheck.py
23
23
        print_user("Error opening file: %s, %s" % (fname, str(e)))
24
24
 
25
25
 
26
 
def check_contents(f, messages, syslog_prefix):
 
26
def check_contents(f, messages, syslog_prefix, skip_prefix):
27
27
 
28
28
    if not f:
29
29
        print_user("Failed to open file/database")
39
39
 
40
40
    read_line = f.readline().strip()
41
41
    while read_line:
42
 
        if read_line[:len(syslog_prefix)] != syslog_prefix:
43
 
            print_user("message does not start with syslog_prefix, file=%s:%d, line=%s" % (f, lineno, read_line))
 
42
        prefix_len = len(syslog_prefix);
 
43
 
 
44
        if read_line[skip_prefix:prefix_len+skip_prefix] != syslog_prefix:
 
45
            print_user("message does not start with syslog_prefix=%s, file=%s:%d, line=%s" % (syslog_prefix, f, lineno, read_line))
44
46
            return False
45
 
        msg = read_line[len(syslog_prefix):]
 
47
        msg = read_line[skip_prefix+prefix_len:]
46
48
        m = re.match("^ (\S+) (\d+)/(\d+)", msg)
47
49
 
48
50
        if not m:
73
75
            return False
74
76
    return True
75
77
 
76
 
def check_reader_expected(reader, messages, settle_time, syslog_prefix):
77
 
    return check_contents(reader, messages, syslog_prefix)
 
78
def check_reader_expected(reader, messages, settle_time, syslog_prefix, skip_prefix):
 
79
    return check_contents(reader, messages, syslog_prefix, skip_prefix)
78
80
 
79
 
def check_file_expected(fname, messages, settle_time=1, syslog_prefix=syslog_prefix):
 
81
def check_file_expected(fname, messages, settle_time=1, syslog_prefix=syslog_prefix, skip_prefix = 0):
80
82
    print_user("Checking contents of output files: %s" % fname)
81
83
    flush_files(settle_time)
82
84
 
85
87
    else:
86
88
        iter = (file_reader,)
87
89
    for reader in iter:
88
 
        return check_reader_expected(reader(fname), messages, settle_time, syslog_prefix)
 
90
        return check_reader_expected(reader(fname), messages, settle_time, syslog_prefix, skip_prefix)
89
91
 
90
 
def check_sql_expected(dbname, tablename, messages, settle_time=1, syslog_prefix=""):
 
92
def check_sql_expected(dbname, tablename, messages, settle_time=1, syslog_prefix="", skip_prefix=0 ):
91
93
    print_user("Checking contents of output database %s, table: %s" % (dbname, tablename))
92
 
    return check_reader_expected(sql_reader((dbname, tablename)), messages, settle_time, syslog_prefix)
 
94
    return check_reader_expected(sql_reader((dbname, tablename)), messages, settle_time, syslog_prefix, skip_prefix)