You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kieran <ki...@esperi.demon.co.uk> on 2002/08/01 03:39:47 UTC
[TEST PATCH] RE: svn commit: rev 2838 - trunk/subversion/libsvn_wc
On Thu, 1 Aug 2002, Sander Striker wrote:
> > From: striker@tigris.org [mailto:striker@tigris.org]
> > Sent: 01 August 2002 04:31
>
> > Author: striker
> > Date: 2002-07-31 21:30:42 -0500 (Wed, 31 Jul 2002)
> > New Revision: 2838
> >
> All tests succeeded with that patch in place, so I think we need
> a new test which takes this into account. I kind of was expecting
> failures with my patch in place ;)
>
Enclosed is a patch to stat_tests.py which is designed to pass based
on the presence of Sander's patch.
Regards
Kieran
--
Log message:
Sander has fixed a problem in "svn status -vN". See rev 2838 for
details
* ./subversion/tests/clients/cmdline/stat_tests.py:
Added status_includes_versioned_directories
Index: ./subversion/tests/clients/cmdline/stat_tests.py
===================================================================
--- ./subversion/tests/clients/cmdline/stat_tests.py
+++ ./subversion/tests/clients/cmdline/stat_tests.py Thu Aug 1 04:28:58 2002
@@ -125,9 +125,31 @@
return svntest.actions.run_and_verify_unquiet_status(wc_backup,
expected_status)
-
-
-
+# svn status -vN should include versioned directories
+def status_includes_versioned_directories(sbox):
+ "Check that 'svn status -vN' works"
+ # Bootstrap
+ if sbox.build():
+ return 1
+
+ wc_dir = sbox.wc_dir
+ was_cwd = os.getcwd ()
+
+ os.chdir (wc_dir)
+
+ stdout_lines, stderr_lines = \
+ svntest.main.run_svn (None, 'status', '-vN')
+ for line in stdout_lines:
+ print line
+
+ # Ok, so where does the magic number 3 come from?
+ # it's the number of files and directories in the root of the "greek
+ # repository"
+ # Note that changing this repository will break this test...
+ if (len(stdout_lines) != 3):
+ os.chdir (was_cwd)
+ return 1
+ return 0
########################################################################
# Run the tests
@@ -137,6 +159,7 @@
test_list = [ None,
stat_unversioned_file_in_current_dir,
status_update_with_nested_adds,
+ status_includes_versioned_directories,
]
if __name__ == '__main__':
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [TEST PATCH] RE: svn commit: rev 2838 - trunk/subversion/libsvn_wc
Posted by Kieran <ki...@esperi.demon.co.uk>.
On 5 Aug 2002, Karl Fogel wrote:
> Kieran, does Sander's commit of revision 2843 obviate the need for
> your patch below?
>
Yup, his solution does the same thing but is more robust.
Regards
Kieran
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [TEST PATCH] RE: svn commit: rev 2838 - trunk/subversion/libsvn_wc
Posted by Karl Fogel <kf...@newton.ch.collab.net>.
Kieran, does Sander's commit of revision 2843 obviate the need for
your patch below?
-Karl
Kieran <ki...@esperi.demon.co.uk> writes:
> Log message:
>
> Sander has fixed a problem in "svn status -vN". See rev 2838
> * ./subversion/tests/clients/cmdline/stat_tests.py:
> Added status_includes_versioned_directories
>
>
> ./subversion/tests/clients/cmdline/stat_tests.py
> ===================================================================
> --- /home/kieran/download/subversion/trunk-bacchus/subversion/tests/clients/cmdline/stat_tests.py
> +++ /home/kieran/download/subversion/trunk-bacchus/subversion/tests/clients/cmdline/stat_tests.py Thu Aug 1 06:00:31 2002
> @@ -125,9 +125,30 @@
> return svntest.actions.run_and_verify_unquiet_status(wc_backup,
> expected_status)
>
> -
> -
> -
> +# svn status -vN should include versioned directories
> +def status_includes_versioned_directories(sbox):
> + "Check that 'svn status -vN' works"
> + # Bootstrap
> + if sbox.build():
> + return 1
> +
> + wc_dir = sbox.wc_dir
> + was_cwd = os.getcwd ()
> +
> + os.chdir (wc_dir)
> +
> + stdout_lines, stderr_lines = \
> + svntest.main.run_svn (None, 'status', '-vN')
> +
> + # Ok, so where does the magic number 3 come from?
> + # it's the number of files and directories in the root of the "greek
> + # repository
> + # Note that changing this repository will break this test...
> + if (len(stdout_lines) != 3):
> + os.chdir (was_cwd)
> + return 1
> + os.chdir (was_cwd)
> + return 0
>
> ########################################################################
> # Run the tests
> @@ -137,6 +158,7 @@
> test_list = [ None,
> stat_unversioned_file_in_current_dir,
> status_update_with_nested_adds,
> + status_includes_versioned_directories,
> ]
>
> if __name__ == '__main__':
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: [TEST PATCH] RE: svn commit: rev 2838 - trunk/subversion/libsvn_wc
Posted by Sander Striker <st...@apache.org>.
> From: Kieran [mailto:kieran@esperi.demon.co.uk]
> Sent: 01 August 2002 07:03
> On Thu, 1 Aug 2002, Kieran wrote:
>> Enclosed is a patch to stat_tests.py which is designed to pass based
>> on the presence of Sander's patch.
Hi Kieran,
Thanks for the patch. After reviewing I decided to commit a slightly
more generic test, since that was simpler. Thanks for pushing me to
look at the tests ;)
Sander
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [TEST PATCH] RE: svn commit: rev 2838 - trunk/subversion/libsvn_wc
Posted by Kieran <ki...@esperi.demon.co.uk>.
On Thu, 1 Aug 2002, Kieran wrote:
> On Thu, 1 Aug 2002, Sander Striker wrote:
>
> > > From: striker@tigris.org [mailto:striker@tigris.org]
> > > Sent: 01 August 2002 04:31
> >
> > > Author: striker
> > > Date: 2002-07-31 21:30:42 -0500 (Wed, 31 Jul 2002)
> > > New Revision: 2838
> > >
>
> > All tests succeeded with that patch in place, so I think we need
> > a new test which takes this into account. I kind of was expecting
> > failures with my patch in place ;)
> >
> Enclosed is a patch to stat_tests.py which is designed to pass based
> on the presence of Sander's patch.
>
The original patch still had debugging statements:
Log message:
Sander has fixed a problem in "svn status -vN". See rev 2838
* ./subversion/tests/clients/cmdline/stat_tests.py:
Added status_includes_versioned_directories
./subversion/tests/clients/cmdline/stat_tests.py
===================================================================
--- /home/kieran/download/subversion/trunk-bacchus/subversion/tests/clients/cmdline/stat_tests.py
+++ /home/kieran/download/subversion/trunk-bacchus/subversion/tests/clients/cmdline/stat_tests.py Thu Aug 1 06:00:31 2002
@@ -125,9 +125,30 @@
return svntest.actions.run_and_verify_unquiet_status(wc_backup,
expected_status)
-
-
-
+# svn status -vN should include versioned directories
+def status_includes_versioned_directories(sbox):
+ "Check that 'svn status -vN' works"
+ # Bootstrap
+ if sbox.build():
+ return 1
+
+ wc_dir = sbox.wc_dir
+ was_cwd = os.getcwd ()
+
+ os.chdir (wc_dir)
+
+ stdout_lines, stderr_lines = \
+ svntest.main.run_svn (None, 'status', '-vN')
+
+ # Ok, so where does the magic number 3 come from?
+ # it's the number of files and directories in the root of the "greek
+ # repository
+ # Note that changing this repository will break this test...
+ if (len(stdout_lines) != 3):
+ os.chdir (was_cwd)
+ return 1
+ os.chdir (was_cwd)
+ return 0
########################################################################
# Run the tests
@@ -137,6 +158,7 @@
test_list = [ None,
stat_unversioned_file_in_current_dir,
status_update_with_nested_adds,
+ status_includes_versioned_directories,
]
if __name__ == '__main__':
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org