1644

pending completion

Build # 1644

Build Type

Pull #576

travis-ci

Committed by

web-flow

Commit Message

[FIX] test_server: Ignore trailing whitespaces on log messages

Odoo recently introduced a change in the way logs are printed, adding
performance information when logging HTTP requests:
https://github.com/odoo/odoo/commit/c44fe9123#diff-d301b3dd399c26a7f38fb31c9e1dfbddR136

However, that causes all messages who don't containg such information to
contain a trailing whitespace.

This commit improves the regexp used to match messages in logs, to not
take into account trailing whitespaces.#

Pull Request Pull Request #576: [FIX] test_server: Ignore trailing whitespaces on log messages

Run Details

772 of 855 relevant lines covered (90.29%)

4.41 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

90.32

/travis/travis_run_tests

#!/usr/bin/env python
# coding: utf-8

from __future__ import print_function
from __future__ import unicode_literals
import os
import subprocess
import sys
from travis_helpers import success_msg, fail_msg


def main(test_list):
    """
    Loop through each test and run them, add display results at the end

    If the test has a .py extension, import as a list and call main function

    :param list test_list: list of lists containing commands to run
    :return: highest error code
    """
    args = sys.argv[1:]
    results = []
    for test in test_list:
        # keep backward compatibility with version as an argument
        print("======== Testing %s ========" % test[0])
        test_w_args = test + args
        test_file = test_w_args[0]
        if test_file.endswith(".py"):
            test_lib = test_file[:-3]
            try:
                res = __import__(test_lib).main(argv=test_w_args)
            except Exception as e:
                print(e)
                res = 1
        else:
            res = subprocess.call(test_w_args)
        results.append(res)

    print()
    print("+" + "="*39)
    print("|  Tests summary:")
    print("|" + "-"*39)
    for test, error in zip(test_list, results):
        outcome = fail_msg if error else success_msg
        print("| {0:<28}{1}".format(test[0], outcome))
    print("+" + "="*39)
    return max(results)


if __name__ == '__main__':
    lint_check_disabled = os.environ.get('LINT_CHECK') == '0'
    lint_check_enabled = os.environ.get('LINT_CHECK') == '1'
    tests_enabled = os.environ.get('TESTS') == '1'
    tests_unspecified = os.environ.get('TESTS') is None
    is_oca_project = os.environ.get('TRAVIS_REPO_SLUG', '').startswith('OCA/')

    # TRAVIS_PULL_REQUEST contains the pull request number or 'false'
    is_pull_request = os.environ.get('TRAVIS_PULL_REQUEST') != 'false'
    # run makepot using a fresh database
    # where addons are going to be installed
    # is MAKEPOT=1 and TESTS=1, test_server.py will run
    # makepot using the test database, which will be faster
    must_run_makepot = (
        (os.environ.get('MAKEPOT') == '1' or
         os.environ.get('TRANSIFEX') == '1') and
        not tests_enabled and
        is_oca_project and
        os.environ.get('TRAVIS_BRANCH') in ('8.0', '9.0', '10.0', '11.0') and
        not is_pull_request and
        os.environ.get('GITHUB_USER') and
        os.environ.get('GITHUB_EMAIL') and
        os.environ.get('GITHUB_TOKEN')
    )

    # Test list. Each test is a list with command + arguments.
    tests = []

    if not lint_check_disabled:
        tests.append(['test_flake8'])
        tests.append(['test_pylint'])

    if tests_unspecified and not lint_check_enabled:
        tests.append(['test_server.py'])

    elif tests_enabled:
        tests.append(['test_server.py'])

    if must_run_makepot:
        tests.append(['travis_makepot'])

    if tests:
        exit(main(tests))

1	#!/usr/bin/env python
2	# coding: utf-8
3
4	from __future__ import print_function	7✔
5	from __future__ import unicode_literals	7✔
6	import os	7✔
7	import subprocess	7✔
8	import sys	7✔
9	from travis_helpers import success_msg, fail_msg	7✔
10
11
12	def main(test_list):	7✔
13	"""
14	Loop through each test and run them, add display results at the end
15
16	If the test has a .py extension, import as a list and call main function
17
18	:param list test_list: list of lists containing commands to run
19	:return: highest error code
20	"""
21	args = sys.argv[1:]	7✔
22	results = []	7✔
23	for test in test_list:	7✔
24	# keep backward compatibility with version as an argument
25	print("======== Testing %s ========" % test[0])	7✔
26	test_w_args = test + args	7✔
27	test_file = test_w_args[0]	7✔
28	if test_file.endswith(".py"):	7✔
29	test_lib = test_file[:-3]	6✔
30	try:	6✔
31	res = __import__(test_lib).main(argv=test_w_args)	6✔
32	except Exception as e:	×
33	print(e)	×
34	res = 1	×
35	else:
36	res = subprocess.call(test_w_args)	1✔
37	results.append(res)	7✔
38
39	print()	7✔
40	print("+" + "="*39)	7✔
41	print("\| Tests summary:")	7✔
42	print("\|" + "-"*39)	7✔
43	for test, error in zip(test_list, results):	7✔
44	outcome = fail_msg if error else success_msg	7✔
45	print("\| {0:<28}{1}".format(test[0], outcome))	7✔
46	print("+" + "="*39)	7✔
47	return max(results)	7✔
48
49
50	if __name__ == '__main__':	6✔
51	lint_check_disabled = os.environ.get('LINT_CHECK') == '0'	6✔
52	lint_check_enabled = os.environ.get('LINT_CHECK') == '1'	6✔
53	tests_enabled = os.environ.get('TESTS') == '1'	6✔
54	tests_unspecified = os.environ.get('TESTS') is None	6✔
55	is_oca_project = os.environ.get('TRAVIS_REPO_SLUG', '').startswith('OCA/')	6✔
56
57	# TRAVIS_PULL_REQUEST contains the pull request number or 'false'
58	is_pull_request = os.environ.get('TRAVIS_PULL_REQUEST') != 'false'	6✔
59	# run makepot using a fresh database
60	# where addons are going to be installed
61	# is MAKEPOT=1 and TESTS=1, test_server.py will run
62	# makepot using the test database, which will be faster
63	must_run_makepot = (	6✔
64	(os.environ.get('MAKEPOT') == '1' or
65	os.environ.get('TRANSIFEX') == '1') and
66	not tests_enabled and
67	is_oca_project and
68	os.environ.get('TRAVIS_BRANCH') in ('8.0', '9.0', '10.0', '11.0') and
69	not is_pull_request and
70	os.environ.get('GITHUB_USER') and
71	os.environ.get('GITHUB_EMAIL') and
72	os.environ.get('GITHUB_TOKEN')
73	)
74
75	# Test list. Each test is a list with command + arguments.
76	tests = []	6✔
77
78	if not lint_check_disabled:	6✔
79	tests.append(['test_flake8'])
80	tests.append(['test_pylint'])
81
82	if tests_unspecified and not lint_check_enabled:	6✔
83	tests.append(['test_server.py'])
84
85	elif tests_enabled:	6✔
86	tests.append(['test_server.py'])	6✔
87
88	if must_run_makepot:	6✔
89	tests.append(['travis_makepot'])
90
91	if tests:	6✔
92	exit(main(tests))	6✔

OCA / maintainer-quality-tools / 1644

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous