svn commit: r1875040 - in /subversion/trunk/subversion/tests/cmdline: getopt_tests_data/svn--help_stdout getopt_tests_data/svn_help_stdout shelf_tests.py

[ju...@apache.org]

Author: julianfoad
Date: Tue Mar 10 13:07:03 2020
New Revision: 1875040

URL: http://svn.apache.org/viewvc?rev=1875040&view=rev
Log:
Adjust tests following r1875039 (disable shelving by default).

Modified:
    subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
    subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
    subversion/trunk/subversion/tests/cmdline/shelf_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout?rev=1875040&r1=1875039&r2=1875040&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout (original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout Tue Mar 10 13:07:03 2020
@@ -48,7 +48,5 @@ Available subcommands:
    update (up)
    upgrade
 
-(Use '-v' to show experimental subcommands.)
-
 Subversion is a tool for version control.
 For additional information, see http://subversion.apache.org/

Modified: subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout?rev=1875040&r1=1875039&r2=1875040&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout (original)
+++ subversion/trunk/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout Tue Mar 10 13:07:03 2020
@@ -48,7 +48,5 @@ Available subcommands:
    update (up)
    upgrade
 
-(Use '-v' to show experimental subcommands.)
-
 Subversion is a tool for version control.
 For additional information, see http://subversion.apache.org/

Modified: subversion/trunk/subversion/tests/cmdline/shelf_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/shelf_tests.py?rev=1875040&r1=1875039&r2=1875040&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/shelf_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/shelf_tests.py Tue Mar 10 13:07:03 2020
@@ -46,6 +46,10 @@ Issue = svntest.testcase.Issue_deco
 Wimp = svntest.testcase.Wimp_deco
 Item = wc.StateItem
 
+def shelf3_enabled():
+  v = os.getenv('SVN_EXPERIMENTAL_COMMANDS')
+  return v is not None and v.find('shelf3') >= 0
+
 #----------------------------------------------------------------------
 
 def state_from_status(wc_dir,
@@ -159,6 +163,7 @@ def shelve_unshelve(sbox, modifier, cann
 #
 #   Each test must return on success or raise on failure.
 
+@SkipUnless(shelf3_enabled)
 def shelve_text_mods(sbox):
   "shelve text mods"
 
@@ -169,6 +174,7 @@ def shelve_text_mods(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_prop_changes(sbox):
   "shelve prop changes"
 
@@ -180,6 +186,7 @@ def shelve_prop_changes(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_adds(sbox):
   "shelve adds"
 
@@ -193,6 +200,7 @@ def shelve_adds(sbox):
 #----------------------------------------------------------------------
 
 @Issue(4709)
+@SkipUnless(shelf3_enabled)
 def shelve_deletes(sbox):
   "shelve deletes"
 
@@ -203,6 +211,7 @@ def shelve_deletes(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_replace(sbox):
   "shelve replace"
 
@@ -215,6 +224,7 @@ def shelve_replace(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_empty_adds(sbox):
   "shelve empty adds"
   sbox.build(empty=True)
@@ -228,6 +238,7 @@ def shelve_empty_adds(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_empty_deletes(sbox):
   "shelve empty deletes"
   sbox.build(empty=True)
@@ -243,6 +254,7 @@ def shelve_empty_deletes(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_from_inner_path(sbox):
   "shelve from inner path"
 
@@ -303,6 +315,7 @@ def save_revert_restore(sbox, modifier1,
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def checkpoint_basic(sbox):
   "checkpoint basic"
 
@@ -318,6 +331,7 @@ def checkpoint_basic(sbox):
 #----------------------------------------------------------------------
 
 @Issue(3747)
+@SkipUnless(shelf3_enabled)
 def shelve_mergeinfo(sbox):
   "shelve mergeinfo"
 
@@ -329,6 +343,7 @@ def shelve_mergeinfo(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def unshelve_refuses_if_conflicts(sbox):
   "unshelve refuses if conflicts"
 
@@ -372,6 +387,7 @@ def unshelve_refuses_if_conflicts(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_binary_file_mod(sbox):
   "shelve binary file mod"
 
@@ -393,6 +409,7 @@ def shelve_binary_file_mod(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_binary_file_add(sbox):
   "shelve binary file add"
 
@@ -414,6 +431,7 @@ def shelve_binary_file_add(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_binary_file_del(sbox):
   "shelve binary file del"
 
@@ -435,6 +453,7 @@ def shelve_binary_file_del(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_binary_file_replace(sbox):
   "shelve binary file replace"
 
@@ -457,6 +476,7 @@ def shelve_binary_file_replace(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_with_log_message(sbox):
   "shelve with log message"
 
@@ -506,6 +526,7 @@ def run_and_verify_shelf_status(wc_dir,
   run_and_verify_status(wc_dir, expected_status,
                         changelists=['svn:shelf:' + shelf])
 
+@SkipUnless(shelf3_enabled)
 def shelf_status(sbox):
   "shelf status"
 
@@ -532,6 +553,7 @@ def shelf_status(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def shelve_mkdir(sbox):
   "shelve mkdir"
 
@@ -545,6 +567,7 @@ def shelve_mkdir(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_rmdir(sbox):
   "shelve rmdir"
 
@@ -560,6 +583,7 @@ def shelve_rmdir(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def shelve_replace_dir(sbox):
   "shelve replace dir"
 
@@ -575,6 +599,7 @@ def shelve_replace_dir(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_file_copy(sbox):
   "shelve file copy"
 
@@ -588,6 +613,7 @@ def shelve_file_copy(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def shelve_dir_copy(sbox):
   "shelve dir copy"
 
@@ -601,6 +627,7 @@ def shelve_dir_copy(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def list_shelves(sbox):
   "list_shelves"
 
@@ -643,6 +670,7 @@ def list_shelves(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def refuse_to_shelve_conflict(sbox):
   "refuse to shelve conflict"
 
@@ -710,6 +738,7 @@ def unshelve_with_merge(sbox, setup, mod
   os.chdir(was_cwd)
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def unshelve_text_mod_merge(sbox):
   "unshelve text mod merge"
 
@@ -735,6 +764,7 @@ def unshelve_text_mod_merge(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def unshelve_text_mod_conflict(sbox):
   "unshelve text mod conflict"
 
@@ -766,6 +796,7 @@ def unshelve_text_mod_conflict(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def unshelve_undeclared_binary_mod_conflict(sbox):
   "unshelve undeclared binary mod conflict"
 
@@ -797,6 +828,7 @@ def unshelve_undeclared_binary_mod_confl
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def unshelve_binary_mod_conflict(sbox):
   "unshelve binary mod conflict"
 
@@ -826,6 +858,7 @@ def unshelve_binary_mod_conflict(sbox):
 
 #----------------------------------------------------------------------
 
+@SkipUnless(shelf3_enabled)
 def unshelve_text_prop_merge(sbox):
   "unshelve text prop merge"
 
@@ -848,6 +881,7 @@ def unshelve_text_prop_merge(sbox):
 #----------------------------------------------------------------------
 
 @XFail()
+@SkipUnless(shelf3_enabled)
 def unshelve_text_prop_conflict(sbox):
   "unshelve text prop conflict"
 
@@ -909,6 +943,7 @@ def run_and_verify_shelf_diff_summarize(
 #----------------------------------------------------------------------
 
 # Exercise a very basic case of shelf-diff.
+@SkipUnless(shelf3_enabled)
 def shelf_diff_simple(sbox):
   "shelf diff simple"
 
@@ -969,6 +1004,7 @@ def shelf_diff_simple(sbox):
 
 @XFail()
 @Issue(4827)
+@SkipUnless(shelf3_enabled)
 def shelve_with_kw_translation(sbox):
   "shelve with kw translation"
   sbox.build(empty=True)