[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] test for svn status -v -N -u

From: Martin Hauner <martin.hauner_at_gmx.net>
Date: 2006-06-17 18:01:54 CEST

Hi,

C. Michael Pilato wrote:
> Martin Hauner wrote:
>> Hi,
>>
>> i'm receiving an unexpected result when combining the status options
>> not-recursive (-N) and show-udpdates (-u) and running status from
>> different places.
> [..]
> Freaky. I'm pretty sure that there was at least one calendar day when this
> all worked, but confess that my 'svn status' code is extremely sensitive (to
> touch, sunlight, oxygen, moon phase, ...)

Ok, I won't touch it ;-)

But at least, here is a test that checks the -u -N combination.

Possible that the order of the expected_output needs to be adjusted. Since
svn status doesn't currently pass the test I don't know what is the correct
order.

-- 
Martin
Subcommander, http://subcommander.tigris.org
a cross platform Win32/Unix/MacOSX subversion GUI client & diff/merge tool.

Added test that checks status -u -N output from different working
directories.

* subversion/tests/cmdline/stat_tests.py
  (status_nonrecursive_update_different_cwd): new test.
  (test_list): added status_nonrecursive_update_different_cwd.
  
Index: subversion/tests/cmdline/stat_tests.py
===================================================================
--- subversion/tests/cmdline/stat_tests.py (revision 20074)
+++ subversion/tests/cmdline/stat_tests.py (working copy)
@@ -371,6 +371,61 @@
 
 #----------------------------------------------------------------------
 
+def status_nonrecursive_update_different_cwd(sbox):
+ "status -v -N -u from different current directories"
+
+ # check combination of status -u and -N
+ # create A/C/J in repository
+ # create A/C/K in working copy
+ # check status output with -u and -N on target C
+ # check status output with -u and -N on target . (in C)
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+ was_cwd = os.getcwd()
+
+ J_url = svntest.main.current_repo_url + '/A/C/J'
+ K_path = os.path.join(wc_dir, 'A', 'C', 'K' )
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'mkdir', '-m', 'rev 2', J_url)
+
+ svntest.actions.run_and_verify_svn(None, None, [],
+ 'mkdir', K_path)
+
+ os.chdir(wc_dir)
+ try:
+ expected_output = [
+ ' * C/J\n'
+ 'A 0 ? ? C/K\n'
+ ' 1 1 jrandom C\n',
+ 'Status against revision: 2\n' ]
+
+ os.chdir('A')
+ svntest.actions.run_and_verify_svn(None,
+ expected_output,
+ [],
+ 'status', '-v', '-N', '-u', 'C')
+
+ expected_output = [
+ ' * J\n',
+ 'A 0 ? ? K\n',
+ ' 1 1 jrandom .\n',
+ 'Status against revision: 2\n']
+
+ os.chdir('C')
+ svntest.actions.run_and_verify_svn(None,
+ expected_output,
+ [],
+ 'status', '-v', '-N', '-u', '.')
+
+ finally:
+ os.chdir(was_cwd)
+
+
+
+#----------------------------------------------------------------------
+
 def status_file_needs_update(sbox):
   "status -u indicates out-of-dateness"
 
@@ -894,6 +949,7 @@
               status_ignored_dir,
               status_unversioned_dir,
               status_dash_u_missing_dir,
+ status_nonrecursive_update_different_cwd,
              ]
 
 if __name__ == '__main__':

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jun 17 18:04:07 2006

This is an archived mail posted to the Subversion Dev mailing list.