Author: hwright
Date: Tue Apr 10 15:02:55 2012
New Revision: 1311773
URL: http://svn.apache.org/viewvc?rev=1311773&view=rev
Log:
Convert more of the tests to the logging framework.
* subversion/tests/cmdline/stat_tests.py,
subversion/tests/cmdline/trans_tests.py,
subversion/tests/cmdline/svnlook_tests.py:
s/print/logger.warn/
Modified:
subversion/trunk/subversion/tests/cmdline/stat_tests.py
subversion/trunk/subversion/tests/cmdline/svnlook_tests.py
subversion/trunk/subversion/tests/cmdline/trans_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1311773&r1=1311772&r2=1311773&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Tue Apr 10 15:02:55
2012
@@ -29,6 +29,9 @@ import os
import re
import time
import datetime
+import logging
+
+logger = logging.getLogger()
# Our testing module
import svntest
@@ -644,7 +647,7 @@ def get_last_changed_date(path):
for line in out:
if re.match("^Last Changed Date", line):
return line
- print("Didn't find Last Changed Date for " + path)
+ logger.warn("Didn't find Last Changed Date for %s", path)
raise svntest.Failure
# Helper for timestamp_behaviour test
@@ -655,7 +658,7 @@ def get_text_timestamp(path):
for line in out:
if re.match("^Text Last Updated", line):
return line
- print("Didn't find text-time for " + path)
+ logger.warn("Didn't find text-time for %s", path)
raise svntest.Failure
# Helper for timestamp_behaviour test
@@ -789,9 +792,9 @@ use-commit-times = yes
or fmt[23:25] != iota_ts[23:25]):
# NOTE: the two strings below won't *exactly* match (see just above),
# but the *numeric* portions of them should.
- print("File timestamp on 'iota' does not match.")
- print(" EXPECTED: %s" % iota_ts)
- print(" ACTUAL: %s" % fmt)
+ logger.warn("File timestamp on 'iota' does not match.")
+ logger.warn(" EXPECTED: %s", iota_ts)
+ logger.warn(" ACTUAL: %s", fmt)
raise svntest.Failure
#----------------------------------------------------------------------
@@ -1750,18 +1753,19 @@ def status_with_tree_conflicts(sbox):
# check if the path should be a victim
m = re.search('tree-conflicted="true"', entry)
if (m is None) and should_be_victim[path]:
- print("ERROR: expected '%s' to be a tree conflict victim." % path)
- print("ACTUAL STATUS OUTPUT:")
- print(output_str)
+ logger.warn("ERROR: expected '%s' to be a tree conflict victim.", path)
+ logger.warn("ACTUAL STATUS OUTPUT:")
+ logger.warn(output_str)
raise svntest.Failure
if m and not should_be_victim[path]:
- print("ERROR: did NOT expect '%s' to be a tree conflict victim." %
path)
- print("ACTUAL STATUS OUTPUT:")
- print(output_str)
+ logger.warn("ERROR: did NOT expect '%s' to be a tree conflict victim.",
+ path)
+ logger.warn("ACTUAL STATUS OUTPUT:")
+ logger.warn(output_str)
raise svntest.Failure
if real_entry_count != len(should_be_victim):
- print("ERROR: 'status --xml' output is incomplete.")
+ logger.warn("ERROR: 'status --xml' output is incomplete.")
raise svntest.Failure
Modified: subversion/trunk/subversion/tests/cmdline/svnlook_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnlook_tests.py?rev=1311773&r1=1311772&r2=1311773&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnlook_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnlook_tests.py Tue Apr 10
15:02:55 2012
@@ -25,7 +25,9 @@
######################################################################
# General modules
-import re, os
+import re, os, logging
+
+logger = logging.getLogger()
# Our testing module
import svntest
@@ -56,9 +58,9 @@ def run_svnlook(*varargs):
def expect(tag, expected, got):
if expected != got:
- print("When testing: %s" % tag)
- print("Expected: %s" % expected)
- print(" Got: %s" % got)
+ logger.warn("When testing: %s", tag)
+ logger.warn("Expected: %s", expected)
+ logger.warn(" Got: %s", got)
raise svntest.Failure
@@ -165,7 +167,7 @@ def test_misc(sbox):
# We cannot rely on svn:author's presence. ra_svn doesn't set it.
if not (proplist == [ 'svn:author', 'svn:date', 'svn:log' ]
or proplist == [ 'svn:date', 'svn:log' ]):
- print("Unexpected result from proplist: %s" % proplist)
+ logger.warn("Unexpected result from proplist: %s", proplist)
raise svntest.Failure
prop_name = 'foo:bar-baz-quux'
@@ -415,12 +417,12 @@ def tree_non_recursive(sbox):
treelist = run_svnlook('tree', '--non-recursive', repo_dir)
for entry in treelist:
if not entry.rstrip() in expected_results_root:
- print("Unexpected result from tree with --non-recursive:")
- print(" entry : %s" % entry.rstrip())
+ logger.warn("Unexpected result from tree with --non-recursive:")
+ logger.warn(" entry : %s", entry.rstrip())
raise svntest.Failure
if len(treelist) != len(expected_results_root):
- print("Expected %i output entries, found %i"
- % (len(expected_results_root), len(treelist)))
+ logger.warn("Expected %i output entries, found %i",
+ len(expected_results_root), len(treelist))
raise svntest.Failure
# check the output of svnlook --non-recursive on a
@@ -428,12 +430,12 @@ def tree_non_recursive(sbox):
treelist = run_svnlook('tree', '--non-recursive', repo_dir, '/A/B')
for entry in treelist:
if not entry.rstrip() in expected_results_deep:
- print("Unexpected result from tree with --non-recursive:")
- print(" entry : %s" % entry.rstrip())
+ logger.warn("Unexpected result from tree with --non-recursive:")
+ logger.warn(" entry : %s", entry.rstrip())
raise svntest.Failure
if len(treelist) != len(expected_results_deep):
- print("Expected %i output entries, found %i"
- % (len(expected_results_deep), len(treelist)))
+ logger.warn("Expected %i output entries, found %i",
+ len(expected_results_deep), len(treelist))
raise svntest.Failure
#----------------------------------------------------------------------
Modified: subversion/trunk/subversion/tests/cmdline/trans_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/trans_tests.py?rev=1311773&r1=1311772&r2=1311773&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/trans_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/trans_tests.py Tue Apr 10
15:02:55 2012
@@ -25,7 +25,9 @@
######################################################################
# General modules
-import os, re
+import os, re, logging
+
+logger = logging.getLogger()
# Our testing module
import svntest
@@ -92,13 +94,13 @@ def check_keywords(actual_kw, expected_k
"""A Helper function to compare two keyword lists"""
if len(actual_kw) != len(expected_kw):
- print("Keyword lists are different by size")
+ logger.warn("Keyword lists are different by size")
raise svntest.Failure
for i in range(0,len(actual_kw)):
if actual_kw[i] != expected_kw[i]:
- print('%s item %s, Expected: %s' % (name, i, expected_kw[i][:-1]))
- print('%s item %s, Got: %s' % (name, i, actual_kw[i][:-1]))
+ logger.warn('%s item %s, Expected: %s', name, i, expected_kw[i][:-1])
+ logger.warn('%s item %s, Got: %s', name, i, actual_kw[i][:-1])
raise svntest.Failure
def setup_working_copy(wc_dir, value_len):
@@ -304,7 +306,7 @@ def keywords_from_birth(sbox):
if not ((len(lines) == 1)
and (re.match("\$URL: (http|https|file|svn|svn\\+ssh)://",
lines[0]))):
- print("URL expansion failed for %s" % url_unexp_path)
+ logger.warn("URL expansion failed for %s", url_unexp_path)
raise svntest.Failure
fp.close()
@@ -314,7 +316,7 @@ def keywords_from_birth(sbox):
if not ((len(lines) == 1)
and (re.match("\$URL: (http|https|file|svn|svn\\+ssh)://",
lines[0]))):
- print("URL expansion failed for %s" % url_exp_path)
+ logger.warn("URL expansion failed for %s", url_exp_path)
raise svntest.Failure
fp.close()
@@ -323,7 +325,7 @@ def keywords_from_birth(sbox):
lines = fp.readlines()
if not ((len(lines) == 1)
and (re.match("\$Id: id_unexp", lines[0]))):
- print("Id expansion failed for %s" % id_exp_path)
+ logger.warn("Id expansion failed for %s", id_exp_path)
raise svntest.Failure
fp.close()
@@ -332,7 +334,7 @@ def keywords_from_birth(sbox):
lines = fp.readlines()
if not ((len(lines) == 1)
and (re.match("\$Id: id_exp", lines[0]))):
- print("Id expansion failed for %s" % id_exp_path)
+ logger.warn("Id expansion failed for %s", id_exp_path)
raise svntest.Failure
fp.close()
@@ -342,7 +344,7 @@ def keywords_from_birth(sbox):
if not ((len(lines) == 1)
and (re.match("\$Header: (https?|file|svn|svn\\+ssh)://.* jrandom",
lines[0]))):
- print("Header expansion failed for %s" % header_unexp_path)
+ logger.warn("Header expansion failed for %s", header_unexp_path)
raise svntest.Failure
fp.close()
@@ -352,7 +354,7 @@ def keywords_from_birth(sbox):
if not ((len(lines) == 1)
and (re.match("\$Header: (https?|file|svn|svn\\+ssh)://.* jrandom",
lines[0]))):
- print("Header expansion failed for %s" % header_exp_path)
+ logger.warn("Header expansion failed for %s", header_exp_path)
raise svntest.Failure
fp.close()
@@ -401,7 +403,7 @@ def keywords_from_birth(sbox):
lines = fp.readlines()
if not ((len(lines) == 1)
and (re.match("\$Id: .*id with space", lines[0]))):
- print("Id expansion failed for %s" % id_with_space_path)
+ logger.warn("Id expansion failed for %s", id_with_space_path)
raise svntest.Failure
fp.close()
@@ -411,7 +413,7 @@ def keywords_from_birth(sbox):
if not ((len(lines) == 1)
and (re.match("\$Id: .*id_exp with_\$_sign [^$]* jrandom \$",
lines[0]))):
- print("Id expansion failed for %s" % id_exp_with_dollar_path)
+ logger.warn("Id expansion failed for %s", id_exp_with_dollar_path)
raise svntest.Failure
fp.close()
@@ -627,7 +629,7 @@ def keyword_expanded_on_checkout(sbox):
if not ((len(lines) == 1)
and (re.match("\$URL: (http|https|file|svn|svn\\+ssh)://",
lines[0]))):
- print("URL expansion failed for %s" % other_url_path)
+ logger.warn("URL expansion failed for %s", other_url_path)
raise svntest.Failure
fp.close()
@@ -764,7 +766,7 @@ def propset_commit_checkout_nocrash(sbox
mu_other_contents = open(mu_other_path).read()
if mu_other_contents != "This is the file 'mu'.\n$Rev: 3 $":
- print("'%s' does not have the expected contents" % mu_other_path)
+ logger.warn("'%s' does not have the expected contents", mu_other_path)
raise svntest.Failure
@@ -878,7 +880,7 @@ def props_only_file_update(sbox):
temps.remove('prop-base')
temps.remove('props')
if temps:
- print('Temporary files leftover: %s' % (', '.join(temps),))
+ logger.warn('Temporary files leftover: %s', (', '.join(temps),))
raise svntest.Failure
