You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/05/07 20:11:06 UTC
svn commit: r1335165 - in /subversion/trunk/subversion/tests/cmdline:
entries_tests.py prop_tests.py schedule_tests.py
Author: hwright
Date: Mon May 7 18:11:05 2012
New Revision: 1335165
URL: http://svn.apache.org/viewvc?rev=1335165&view=rev
Log:
Update a few more test suites to use the logging infrastructure.
* subversion/tests/cmdline/prop_tests.py,
subversion/tests/cmdline/entries_tests.py,
subversion/tests/cmdline/schedule_tests.py:
s/print/logging.warn/
Modified:
subversion/trunk/subversion/tests/cmdline/entries_tests.py
subversion/trunk/subversion/tests/cmdline/prop_tests.py
subversion/trunk/subversion/tests/cmdline/schedule_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/entries_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/entries_tests.py?rev=1335165&r1=1335164&r2=1335165&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/entries_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/entries_tests.py Mon May 7 18:11:05 2012
@@ -33,7 +33,9 @@
# test tries to pick up the straggly little edge cases.
#
-import os
+import os, logging
+
+logger = logging.getLogger()
import svntest
@@ -49,22 +51,22 @@ SCHEDULE_REPLACE = 3
def validate(entry, **kw):
for key, value in kw.items():
if getattr(entry, key) != value:
- print("Entry '%s' has an incorrect value for .%s" % (entry.name, key))
- print(" Expected: %s" % value)
- print(" Actual: %s" % getattr(entry, key))
+ logger.warn("Entry '%s' has an incorrect value for .%s", entry.name, key)
+ logger.warn(" Expected: %s", value)
+ logger.warn(" Actual: %s", getattr(entry, key))
raise svntest.Failure
def check_names(entries, *names):
if entries is None:
- print('entries-dump probably exited with a failure.')
+ logger.warn('entries-dump probably exited with a failure.')
raise svntest.Failure
have = set(entries.keys())
want = set(names)
missing = want - have
if missing:
- print("Entry name(s) not found: %s"
- % ', '.join("'%s'" % name for name in missing))
+ logger.warn("Entry name(s) not found: %s",
+ ', '.join("'%s'" % name for name in missing))
raise svntest.Failure
Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1335165&r1=1335164&r2=1335165&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Mon May 7 18:11:05 2012
@@ -25,7 +25,9 @@
######################################################################
# General modules
-import sys, re, os, stat, subprocess
+import sys, re, os, stat, subprocess, logging
+
+logger = logging.getLogger()
# Our testing module
import svntest
@@ -365,7 +367,7 @@ def update_conflict_props(sbox):
None, None, 1)
if len(extra_files) != 0:
- print("didn't get expected conflict files")
+ logger.warn("didn't get expected conflict files")
raise svntest.verify.SVNUnexpectedOutput
# Resolve the conflicts
@@ -776,9 +778,9 @@ def copy_inherits_special_props(sbox):
expected_stdout = [orig_mime_type + '\n']
if actual_stdout != expected_stdout:
- print("svn pg svn:mime-type output does not match expected.")
- print("Expected standard output: %s\n" % expected_stdout)
- print("Actual standard output: %s\n" % actual_stdout)
+ logger.warn("svn pg svn:mime-type output does not match expected.")
+ logger.warn("Expected standard output: %s\n", expected_stdout)
+ logger.warn("Actual standard output: %s\n", actual_stdout)
raise svntest.verify.SVNUnexpectedOutput
# Check the svn:executable value.
@@ -789,9 +791,9 @@ def copy_inherits_special_props(sbox):
expected_stdout = ['*\n']
if actual_stdout != expected_stdout:
- print("svn pg svn:executable output does not match expected.")
- print("Expected standard output: %s\n" % expected_stdout)
- print("Actual standard output: %s\n" % actual_stdout)
+ logger.warn("svn pg svn:executable output does not match expected.")
+ logger.warn("Expected standard output: %s\n", expected_stdout)
+ logger.warn("Actual standard output: %s\n", actual_stdout)
raise svntest.verify.SVNUnexpectedOutput
#----------------------------------------------------------------------
@@ -1038,8 +1040,8 @@ def binary_props(sbox):
# expected_out, and that errput is empty.
def verify_output(expected_out, output, errput):
if errput != []:
- print('Error: stderr:')
- print(errput)
+ logger.warn('Error: stderr:')
+ logger.warn(errput)
raise svntest.Failure
output.sort()
ln = 0
@@ -1048,8 +1050,8 @@ def verify_output(expected_out, output,
continue
if ((line.find(expected_out[ln]) == -1) or
(line != '' and expected_out[ln] == '')):
- print('Error: expected keywords: %s' % expected_out)
- print(' actual full output: %s' % output)
+ logger.warn('Error: expected keywords: %s', expected_out)
+ logger.warn(' actual full output: %s', output)
raise svntest.Failure
ln = ln + 1
if ln != len(expected_out):
@@ -1984,7 +1986,7 @@ def prop_reject_grind(sbox):
if match:
# The last line in the list is always an empty string.
if msg_lines[i + 1] == "":
- #print("found message %i in file at line %i" % (n, j))
+ #logger.info("found message %i in file at line %i" % (n, j))
break
i += 1
else:
@@ -2466,7 +2468,7 @@ def file_matching_dir_prop_reject(sbox):
extra_files,
None, None, True, '-r', '2', wc_dir)
if len(extra_files) != 0:
- print("didn't get expected conflict files")
+ logger.warn("didn't get expected conflict files")
raise svntest.verify.SVNUnexpectedOutput
# Revert and update to check that conflict files are removed
Modified: subversion/trunk/subversion/tests/cmdline/schedule_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/schedule_tests.py?rev=1335165&r1=1335164&r2=1335165&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/schedule_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/schedule_tests.py Mon May 7 18:11:05 2012
@@ -26,7 +26,9 @@
######################################################################
# General modules
-import os
+import os, logging
+
+logger = logging.getLogger()
# Our testing module
import svntest
@@ -256,8 +258,8 @@ def check_reversion(files, output):
output.sort()
expected_output.sort()
if output != expected_output:
- print("Expected output: %s" % expected_output)
- print("Actual output: %s" % output)
+ logger.warn("Expected output: %s", expected_output)
+ logger.warn("Actual output: %s", output)
raise svntest.Failure
#----------------------------------------------------------------------