svn commit: r933474 - /subversion/trunk/subversion/tests/cmdline/trans_tests.py

[gs...@apache.org]

Author: gstein
Date: Tue Apr 13 03:16:36 2010
New Revision: 933474

URL: http://svn.apache.org/viewvc?rev=933474&view=rev
Log:
Make some fixes to trans_tests #9.

* subversion/tests/cmdline/trans_tests.py:
  (props_only_file_update): remove the keywords, rather than just changing
    them. this exercises a code path of "keywords exist" to "no keywords".
    also fix the testing of the content; just placing the intended content
    into the State wasn't getting it checked.

Modified:
    subversion/trunk/subversion/tests/cmdline/trans_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/trans_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/trans_tests.py?rev=933474&r1=933473&r2=933474&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/trans_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/trans_tests.py Tue Apr 13 03:16:36 2010
@@ -826,11 +826,7 @@ def props_only_file_update(sbox):
   # put the content back to its untranslated form
   open(iota_path, 'w').writelines(content)
 
-  svntest.main.run_svn(None, 'propset', 'svn:keywords', 'Id', iota_path)
-
-#  expected_output = wc.State(wc_dir, {
-#    'iota' : Item(verb='Sending'),
-#    })
+  svntest.main.run_svn(None, 'propdel', 'svn:keywords', iota_path)
 
   expected_status.tweak('iota', wc_rev=3)
 
@@ -853,6 +849,9 @@ def props_only_file_update(sbox):
                                         False,
                                         wc_dir, '-r', '2')
 
+  if open(iota_path).read() != ''.join(content_expanded):
+    raise svntest.Failure("$Author$ is not expanded in 'iota'")
+
   # Update to r3. this should retranslate iota, dropping the keyword expansion
   expected_disk = svntest.main.greek_state.copy()
   expected_disk.tweak('iota', contents=''.join(content))
@@ -866,6 +865,9 @@ def props_only_file_update(sbox):
                                         False,
                                         wc_dir)
 
+  if open(iota_path).read() != ''.join(content):
+    raise svntest.Failure("$Author$ is not contracted in 'iota'")
+
   # We used to leave some temporary files around. Make sure that we don't.
   temps = os.listdir(os.path.join(wc_dir, '.svn', 'tmp'))
   temps.remove('prop-base')