Author: hwright
Date: Mon Apr 9 15:54:20 2012
New Revision: 1311291
URL: http://svn.apache.org/viewvc?rev=1311291&view=rev
Log:
More use of logging in the test suite.
* subversion/tests/cmdline/update_tests.py,
subversion/tests/cmdline/svnadmin_tests.py,
subversion/tests/cmdline/upgrade_tests.py:
s/print/logger.warn/
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1311291&r1=1311290&r2=1311291&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Mon Apr 9
15:54:20 2012
@@ -30,6 +30,9 @@ import re
import shutil
import sys
import threading
+import logging
+
+logger = logging.getLogger()
# Our testing module
import svntest
@@ -458,7 +461,7 @@ def hotcopy_format(sbox):
sbox.repo_dir,
backup_dir)
if errput:
- print("Error: hotcopy failed")
+ logger.warn("Error: hotcopy failed")
raise svntest.Failure
# verify that the db/format files are the same
@@ -471,7 +474,7 @@ def hotcopy_format(sbox):
fp2.close()
if contents1 != contents2:
- print("Error: db/format file contents do not match after hotcopy")
+ logger.warn("Error: db/format file contents do not match after hotcopy")
raise svntest.Failure
#----------------------------------------------------------------------
@@ -488,7 +491,7 @@ def setrevprop(sbox):
"--bypass-hooks",
iota_path)
if errput:
- print("Error: 'setlog' failed")
+ logger.warn("Error: 'setlog' failed")
raise svntest.Failure
# Verify that the revprop value matches what we set when retrieved
@@ -507,7 +510,7 @@ def setrevprop(sbox):
"-r0", "svn:author",
foo_path)
if errput:
- print("Error: 'setrevprop' failed")
+ logger.warn("Error: 'setrevprop' failed")
raise svntest.Failure
# Verify that the revprop value matches what we set when retrieved
@@ -860,7 +863,7 @@ def set_uuid(sbox):
raise SVNUnexpectedStderr(errput)
new_uuid = output[0].rstrip()
if new_uuid == orig_uuid:
- print("Error: new UUID matches the original one")
+ logger.warn("Error: new UUID matches the original one")
raise svntest.Failure
# Now, try setting the UUID back to the original value.
@@ -871,7 +874,7 @@ def set_uuid(sbox):
raise SVNUnexpectedStderr(errput)
new_uuid = output[0].rstrip()
if new_uuid != orig_uuid:
- print("Error: new UUID doesn't match the original one")
+ logger.warn("Error: new UUID doesn't match the original one")
raise svntest.Failure
#----------------------------------------------------------------------
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1311291&r1=1311290&r2=1311291&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Mon Apr 9
15:54:20 2012
@@ -27,6 +27,9 @@
# General modules
import sys, re, os, subprocess
import time
+import logging
+
+logger = logging.getLogger()
# Our testing module
import svntest
@@ -92,7 +95,7 @@ def detect_extra_files(node, extra_files
extra_files.pop(extra_files.index(fdata)) # delete pattern from list
return
- print("Found unexpected object: %s" % node.name)
+ logger.warn("Found unexpected object: %s", node.name)
raise svntest.tree.SVNTreeUnequal
@@ -197,8 +200,8 @@ def update_binary_file(sbox):
# verify that the extra_files list is now empty.
if len(extra_files) != 0:
- print("Not all extra reject files have been accounted for:")
- print(extra_files)
+ logger.warn("Not all extra reject files have been accounted for:")
+ logger.warn(extra_files)
raise svntest.Failure
#----------------------------------------------------------------------
@@ -695,7 +698,7 @@ def update_to_resolve_text_conflicts(sbo
# verify that the extra_files list is now empty.
if len(extra_files) != 0:
- print("didn't get expected extra files")
+ logger.warn("didn't get expected extra files")
raise svntest.Failure
# remove the conflicting files to clear text conflict but not props conflict
@@ -708,7 +711,7 @@ def update_to_resolve_text_conflicts(sbo
exit_code, stdout_lines, stdout_lines = svntest.main.run_svn(None, 'up',
wc_backup)
if len (stdout_lines) > 0:
- print("update 2 failed")
+ logger.warn("update 2 failed")
raise svntest.Failure
# Create expected status tree
@@ -5375,7 +5378,7 @@ def update_with_file_lock_and_keywords_p
sbox.simple_update()
mu_ts_after_update = os.path.getmtime(mu_path)
if (mu_ts_before_update != mu_ts_after_update):
- print("The timestamp of 'mu' before and after update does not match.")
+ logger.warn("The timestamp of 'mu' before and after update does not
match.")
raise svntest.Failure
#----------------------------------------------------------------------
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1311291&r1=1311290&r2=1311291&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Mon Apr 9
15:54:20 2012
@@ -35,6 +35,9 @@ import shutil
import sys
import tarfile
import tempfile
+import logging
+
+logger = logging.getLogger()
import svntest
from svntest import wc
@@ -179,15 +182,15 @@ def simple_property_verify(dir_path, exp
v2 = node2.get(prop, None)
if not v2:
- print('\'%s\' property on \'%s\' not found in %s' %
- (prop, key, name))
+ logger.warn('\'%s\' property on \'%s\' not found in %s',
+ prop, key, name)
equal = False
if match and v1 != v2:
- print('Expected \'%s\' on \'%s\' to be \'%s\', but found \'%s\'' %
- (prop, key, v1, v2))
+ logger.warn('Expected \'%s\' on \'%s\' to be \'%s\', but found
\'%s\'',
+ prop, key, v1, v2)
equal = False
else:
- print('\'%s\': %s not found in %s' % (key, dict1[key], name))
+ logger.warn('\'%s\': %s not found in %s', key, dict1[key], name)
equal = False
return equal
@@ -214,7 +217,7 @@ def simple_property_verify(dir_path, exp
v2 = diff_props(actual_props, expected_props, 'expected', False)
if not v1 or not v2:
- print('Actual properties: %s' % actual_props)
+ logger.warn('Actual properties: %s', actual_props)
raise svntest.Failure("Properties unequal")
def simple_checksum_verify(expected_checksums):
@@ -244,7 +247,7 @@ def run_and_verify_status_no_server(wc_d
except svntest.tree.SVNTreeError:
svntest.verify.display_trees(None, 'STATUS OUTPUT TREE',
expected_status.old_tree(), actual)
- print("ACTUAL STATUS TREE:")
+ logger.warn("ACTUAL STATUS TREE:")
svntest.tree.dump_tree_script(actual, wc_dir + os.sep)
raise
