subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1773992 [6/8] - in /subversion/branches/ra-git: ./ build/ac-macros/ notes/ subversion/bindings/javahl/native/ subversion/bindings/swig/perl/libsvn_swig_perl/ subversion/bindings/swig/ruby/test/ subversion/include/ subversion/include/privat...
Date Tue, 13 Dec 2016 12:36:57 GMT
Modified: subversion/branches/ra-git/subversion/tests/cmdline/autoprop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/autoprop_tests.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/autoprop_tests.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/autoprop_tests.py Tue Dec 13 12:36:55
2016
@@ -60,7 +60,7 @@ def check_proplist(path, exp_out):
 
 #----------------------------------------------------------------------
 
-def create_config(config_dir, enable_flag):
+def create_config(sbox, enable_flag):
   "create config directories and files"
 
   # contents of the file 'config'
@@ -82,7 +82,7 @@ quotetest = svn:keywords="Author Date Id
 * = auto=oui
 ''' % (enable_flag and 'yes' or 'no')
 
-  svntest.main.create_config_dir(config_dir, config_contents)
+  return sbox.create_config_dir(config_contents)
 
 #----------------------------------------------------------------------
 
@@ -103,9 +103,11 @@ def autoprops_test(sbox, cmd, cfgenable,
   # some directories
   wc_dir = sbox.wc_dir
   tmp_dir = os.path.abspath(sbox.add_wc_path('autoprops'))
-  config_dir = os.path.join(tmp_dir, 'autoprops_config_' + sbox.name)
+  os.makedirs(tmp_dir)
   repos_url = sbox.repo_url
 
+  config_dir = create_config(sbox, cfgenable)
+
   # initialize parameters
   if cmd == 'import':
     parameters = ['import', '-m', 'bla']
@@ -116,8 +118,6 @@ def autoprops_test(sbox, cmd, cfgenable,
 
   parameters = parameters + ['--config-dir', config_dir]
 
-  create_config(config_dir, cfgenable)
-
   # add comandline flags
   if clienable == 1:
     parameters = parameters + ['--auto-props']
@@ -327,7 +327,7 @@ def fail_add_mixed_eol_style(sbox):
 
 #----------------------------------------------------------------------
 
-def create_inherited_autoprops_config(config_dir, enable_flag):
+def create_inherited_autoprops_config(sbox, enable_flag):
   "create config stuffs for inherited autoprops tests"
 
   # contents of the file 'config'
@@ -342,7 +342,7 @@ enable-auto-props = %s
 *.c = svn:keywords=Author Date Id Rev URL;svn:eol-style=native;
 ''' % (enable_flag and 'yes' or 'no')
 
-  svntest.main.create_config_dir(config_dir, config_contents)
+  return sbox.create_config_dir(config_contents)
 
 #----------------------------------------------------------------------
 def check_inheritable_autoprops(sbox, auto_props_cfg_enabled,
@@ -416,9 +416,11 @@ def inheritable_autoprops_test(sbox, cmd
   # some directories
   wc_dir = sbox.wc_dir
   tmp_dir = os.path.abspath(sbox.add_wc_path('iautoprops'))
-  config_dir = os.path.join(tmp_dir, 'autoprops_config_' + sbox.name)
+  os.makedirs(tmp_dir)
   repos_url = sbox.repo_url
 
+  config_dir = create_inherited_autoprops_config(sbox, cfgenable)
+
   # initialize parameters
   if cmd == 'import':
     parameters = ['import', '-m', 'importing']
@@ -429,8 +431,6 @@ def inheritable_autoprops_test(sbox, cmd
 
   parameters = parameters + ['--config-dir', config_dir]
 
-  create_inherited_autoprops_config(config_dir, cfgenable)
-
   # add comandline flags
   inheritable_auto_props_enabled = 1
   if clienable == 1:
@@ -647,10 +647,7 @@ def svn_prop_inheritable_autoprops_add_v
   #
   # Then revert the previous additions and add again, only the
   # svn:auto-props should be applied.
-  tmp_dir = os.path.abspath(sbox.add_wc_path('temp'))
-  config_dir = os.path.join(tmp_dir,
-                            'autoprops_config_disabled_' + sbox.name)
-  create_inherited_autoprops_config(config_dir, False)
+  config_dir = create_inherited_autoprops_config(sbox, False)
 
   svntest.main.run_svn(None, 'revert', '-R', sbox.wc_dir)
   os.chdir(sbox.wc_dir)

Modified: subversion/branches/ra-git/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/basic_tests.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/basic_tests.py Tue Dec 13 12:36:55
2016
@@ -2539,9 +2539,7 @@ def basic_auth_test(sbox):
   wc_dir = sbox.wc_dir
 
   # Set up a custom config directory
-  tmp_dir = os.path.abspath(svntest.main.temp_dir)
-  config_dir = os.path.join(tmp_dir, 'auth-test-config')
-  svntest.main.create_config_dir(config_dir, None)
+  config_dir = sbox.create_config_dir()
 
   # Checkout with jrandom
   exit_code, output, errput = svntest.main.run_command(
@@ -3116,6 +3114,20 @@ def plaintext_password_storage_disabled(
       f.close()
 
 
+
+def filtered_ls(sbox):
+  "filtered 'svn ls'"
+
+  sbox.build(read_only=True)
+  path = sbox.repo_url + "/A/D"
+
+  # check plain info
+  expected = [ "H/omega\n",
+               "gamma\n" ]
+
+  exit_code, output, error = svntest.actions.run_and_verify_svn(
+    None, [], 'ls', path, '--depth=infinity', '--search=*a')
+
 ########################################################################
 # Run the tests
 
@@ -3186,6 +3198,7 @@ test_list = [ None,
               peg_rev_on_non_existent_wc_path,
               mkdir_parents_target_exists_on_disk,
               plaintext_password_storage_disabled,
+              filtered_ls,
              ]
 
 if __name__ == '__main__':

Modified: subversion/branches/ra-git/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/depth_tests.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/depth_tests.py Tue Dec 13 12:36:55
2016
@@ -2897,6 +2897,84 @@ def commit_excluded(sbox):
                                         [], False,
                                         "--set-depth=infinity", wc_dir)
 
+@Issue(4636)
+@XFail()
+def fold_tree_with_deleted_moved_items(sbox):
+  "deleted & moved items left untouched"
+  ign_a, ign_b, ign_c, wc_dir = set_up_depthy_working_copies(sbox,
+                                                             infinity=True)
+
+  A_path = sbox.ospath('A')
+
+  # Delete file lambda, move file pi and directory C
+  sbox.simple_rm('A/B/lambda')
+  sbox.simple_move('A/D/G/pi', 'A/D/G/pi_moved')
+  sbox.simple_move('A/C', 'A/C_moved')
+
+  # Fold the A dir to empty, expect the deleted & moved items ones left
+  # and visible in status, rather than gone without a trace.
+
+  # Directories B and D won't be deleted, because that would remove their
+  # local modifications. Their unmodified descendants are deleted though.
+  expected_output = svntest.wc.State(wc_dir, {
+    'A/B/E'          : Item(status='D '),
+    'A/B/F'          : Item(status='D '),
+    'A/D/G/rho'      : Item(status='D '),
+    'A/D/G/tau'      : Item(status='D '),
+    'A/D/H'          : Item(status='D '),
+    'A/D/gamma'      : Item(status='D '),
+    'A/mu'           : Item(status='D '),
+    })
+  expected_status = svntest.wc.State(wc_dir, {
+    ''               : Item(status='  ', wc_rev=1),
+    'iota'           : Item(status='  ', wc_rev=1),
+    'A'              : Item(status='  ', wc_rev=1),
+    'A/B'            : Item(status='  ', wc_rev=1),
+    'A/B/lambda'     : Item(status='D ', wc_rev=1),
+    'A/C'            : Item(status='D ', wc_rev=1, moved_to='A/C_moved'),
+    'A/C_moved'      : Item(status='A ', wc_rev='-', copied='+',
+                            moved_from='A/C'),
+    'A/D'            : Item(status='  ', wc_rev=1),
+    'A/D/G'          : Item(status='  ', wc_rev=1),
+    'A/D/G/pi'       : Item(status='D ', wc_rev=1, moved_to='A/D/G/pi_moved'),
+    'A/D/G/pi_moved' : Item(status='A ', wc_rev='-', copied='+',
+                            moved_from='A/D/G/pi'),
+    })
+  expected_disk = svntest.wc.State('', {
+    'iota'           : Item(contents="This is the file 'iota'.\n"),
+    'A'              : Item(contents=None),
+    'A/B'            : Item(contents=None),
+    'A/C_moved'      : Item(contents=None),
+    'A/D'            : Item(contents=None),
+    'A/D/G'          : Item(contents=None),
+    'A/D/G/pi_moved' : Item(contents="This is the file 'pi'.\n"),
+    })
+  svntest.actions.run_and_verify_update(wc_dir,
+                                        expected_output,
+                                        expected_disk,
+                                        expected_status,
+                                        [], False,
+                                        '--set-depth', 'empty', A_path)
+  verify_depth(None, "empty", A_path)
+
+@Issue(4642)
+@XFail()
+def fold_tree_with_unversioned_items(sbox):
+  "unversioned files in excluded directory"
+  ign_a, ign_b, ign_c, wc_dir = set_up_depthy_working_copies(sbox,
+                                                             infinity=True)
+
+  # create an unversioned directory within a versioned one
+  A_path = sbox.ospath('A')
+  A_local_path = os.path.join(A_path, 'A_local')
+  os.mkdir(A_local_path)
+
+  # Set A to be excluded.
+  svntest.main.run_svn(None, 'update', '--set-depth=exclude', A_path)
+  
+  # try a simple update afterwards
+  sbox.simple_update()
+  
 #----------------------------------------------------------------------
 # list all tests here, starting with None:
 test_list = [ None,
@@ -2948,7 +3026,9 @@ test_list = [ None,
               revert_depth_files,
               spurious_nodes_row,
               commit_excluded,
-              ]
+              fold_tree_with_deleted_moved_items,
+              fold_tree_with_unversioned_items,
+             ]
 
 if __name__ == "__main__":
   svntest.main.run_tests(test_list)

Modified: subversion/branches/ra-git/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
(original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
Tue Dec 13 12:36:55 2016
@@ -19,6 +19,17 @@ usage: 1. log [PATH][@REV]
   reverse ranges is allowed.
 
   With -v, also print all affected paths with each log message.
+  Each changed path is preceded with a symbol describing the change:
+    A: The path was added or copied.
+    D: The path was deleted.
+    R: The path was replaced (deleted and re-added in the same revision).
+    M: The path's file and/or property content was modified.
+  If an added or replaced path was copied from somewhere else, the copy
+  source path and revision are shown in parentheses.
+  If a file or directory was moved from one path to another with 'svn move'
+  the old path will be listed as deleted and the new path will be listed
+  as copied from the old path at a prior revision.
+
   With -q, don't print the log message body itself (note that this is
   compatible with -v).
 
@@ -73,6 +84,11 @@ usage: 1. log [PATH][@REV]
     was created:
       svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo
 
+    If ^/trunk/foo.c was moved to ^/trunk/bar.c' in revision 22, 'svn log -v'
+    shows a deletion and a copy in its changed paths list, such as:
+       D /trunk/foo.c
+       A /trunk/bar.c (from /trunk/foo.c:21)
+
 Valid options:
   -r [--revision] ARG      : ARG (some commands also take ARG1:ARG2 range)
                              A revision argument can be one of:

Modified: subversion/branches/ra-git/subversion/tests/cmdline/import_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/import_tests.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/import_tests.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/import_tests.py Tue Dec 13 12:36:55
2016
@@ -316,9 +316,7 @@ enable-auto-props = yes
 *.dsp = svn:eol-style=CRLF
 *.txt = svn:eol-style=native
 '''
-  tmp_dir = os.path.abspath(svntest.main.temp_dir)
-  config_dir = os.path.join(tmp_dir, 'autoprops_config')
-  svntest.main.create_config_dir(config_dir, config_contents)
+  config_dir = sbox.create_config_dir(config_contents)
 
   # create a new file and import it
   file_name = "test.dsp"
@@ -418,9 +416,7 @@ def import_inherited_ignores(sbox):
   #
   #   [miscellany]
   #   global-ignores = *.boo *.goo
-  tmp_dir = os.path.abspath(svntest.main.temp_dir)
-  config_dir = os.path.join(tmp_dir, 'autoprops_config_' + sbox.name)
-  create_inherited_ignores_config(config_dir)
+  config_dir = create_inherited_ignores_config(sbox)
 
   # Set some ignore properties.
   sbox.simple_propset(SVN_PROP_INHERITABLE_IGNORES, '*.voo *.noo *.loo', '.')
@@ -446,8 +442,8 @@ def import_inherited_ignores(sbox):
   #   DIR7
   #     file7.foo
   #     DIR8.noo
-  import_tree_dir = os.path.join(os.path.dirname(sys.argv[0]),
-                                 'import_tests_data', 'import_tree')
+  tmp_dir = os.path.abspath(svntest.main.temp_dir)
+  import_tree_dir = os.path.join(tmp_dir, 'import_tree_' + sbox.name)
 
   # Relative WC paths of the imported tree.
   dir1_path  = os.path.join('DIR1.noo')
@@ -466,6 +462,33 @@ def import_inherited_ignores(sbox):
   file7_path = os.path.join('DIR6', 'DIR7', 'file7.foo')
   dir8_path  = os.path.join('DIR6', 'DIR7', 'DIR8.noo')
 
+  import_dirs = [
+    dir1_path,
+    dir2_path,
+    dir3_path,
+    dir4_path,
+    dir5_path,
+    dir6_path,
+    dir7_path,
+    dir8_path,
+    ]
+  import_files = [
+    file1_path,
+    file2_path,
+    file3_path,
+    file4_path,
+    file5_path,
+    file6_path,
+    file7_path,
+    ]
+
+  # Create the (unversioned) tree to be imported.
+  os.mkdir(import_tree_dir)
+  for p in import_dirs:
+    os.mkdir(os.path.join(import_tree_dir, p))
+  for p in import_files:
+    svntest.main.file_write(os.path.join(import_tree_dir, p), 'A file')
+
   # Import the tree to ^/A/B/E.
   # We should not see any *.noo paths because those are blocked at the
   # root of the repository by the svn:global-ignores property.  Likewise

Modified: subversion/branches/ra-git/subversion/tests/cmdline/info_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/info_tests.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/info_tests.py Tue Dec 13 12:36:55
2016
@@ -641,7 +641,7 @@ def info_item_simple(sbox):
 
   sbox.build(read_only=True)
   svntest.actions.run_and_verify_svn(
-    '1', [],
+    ['1'], [],
     'info', '--show-item=revision', '--no-newline',
     sbox.ospath(''))
 

Modified: subversion/branches/ra-git/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/merge_reintegrate_tests.py Tue Dec
13 12:36:55 2016
@@ -2823,6 +2823,38 @@ def renamed_branch_reintegrate(sbox):
   # ### TODO: Check the result more carefully than merely that it completed.
   run_reintegrate(sbox.repo_url + '/RENAMED@8', A_path)
 
+@SkipUnless(server_has_mergeinfo)
+def reintegrate_noop_branch_into_renamed_branch(sbox):
+  """reintegrate no-op branch into renamed branch"""
+  # In this test, the branch has no unique changes but contains a
+  # revision cherry-picked from trunk. Reintegrating such a branch
+  # should work, but used to error out when this test was written.
+
+  # Make A_COPY branch in r2, and do a few more commits to A in r3-6.
+  sbox.build()
+
+  wc_dir = sbox.wc_dir
+  A_path = sbox.ospath('A')
+  A_COPY_path = sbox.ospath('A_COPY')
+  expected_disk, expected_status = set_up_branch(sbox)
+
+  # Cherry-pick merge from trunk to branch
+  youngest_rev = sbox.youngest()
+  svntest.main.run_svn(None, 'merge', '-c', youngest_rev,
+                       sbox.repo_url + '/A', A_COPY_path)
+  sbox.simple_commit()
+  sbox.simple_update()
+
+  # Rename the trunk
+  sbox.simple_move('A', 'A_RENAMED')
+  sbox.simple_commit()
+  sbox.simple_update()
+
+  # Try to reintegrate the branch. This should work but used to fail with:
+  # svn: E160013: File not found: revision 5, path '/A_RENAMED'
+  run_reintegrate(sbox.repo_url + '/A_COPY', sbox.ospath('A_RENAMED'))
+
+
 ########################################################################
 # Run the tests
 
@@ -2850,6 +2882,7 @@ test_list = [ None,
               reintegrate_symlink_deletion,
               no_op_reintegrate,
               renamed_branch_reintegrate,
+              reintegrate_noop_branch_into_renamed_branch,
              ]
 
 if __name__ == '__main__':

Modified: subversion/branches/ra-git/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/move_tests.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/move_tests.py Tue Dec 13 12:36:55
2016
@@ -1387,7 +1387,9 @@ def move_many_update_add(sbox):
      'B/A/A'             : Item(status='  ', treeconflict='U'),
      'B/A/A/BB'          : Item(status='  ', treeconflict='A'),
      # And while resolving
-     'A/A'               : Item(status='  ', treeconflict='C')
+     'A/A'               : Item(status='  ', treeconflict='C'),
+     'A/A/A'             : Item(status='  ', treeconflict='C'),
+     'AAA_2/BB'          : Item(status='A '),
     })
 
   expected_status.tweak('',
@@ -1395,10 +1397,10 @@ def move_many_update_add(sbox):
                         'C', 'C/A', 'C/A/A', 'C/A/A/A',
                         wc_rev='3')
 
-  expected_status.tweak('A/A', treeconflict='C')
   expected_status.add({
         'A/A/A/BB'          : Item(status='D ', copied='+', wc_rev='-'),
         'B/A/A/BB'          : Item(status='D ', wc_rev='3'),
+        'AAA_2/BB'          : Item(status='  ', copied='+', wc_rev='-'),
     })
 
   svntest.actions.run_and_verify_update(wc_dir, expected_output, None,
@@ -1414,20 +1416,21 @@ def move_many_update_add(sbox):
   expected_status.tweak('',
                         'B', 'B/A', 'B/A/A', 'B/A/A/A',
                         'C', 'C/A', 'C/A/A', 'C/A/A/A',
-                        'B/A/A/BB',
                         wc_rev='4')
 
   expected_status.add({
+        'B/A/A/BB'          : Item(status='D ', wc_rev='4'),
         'C/A/A/BB'          : Item(status='D ', wc_rev='4'),
+        'AAA_3/BB'          : Item(status='  ', copied='+', wc_rev='-'),
     })
 
-  expected_status.tweak('A/A/A', treeconflict='C')
 
   expected_output = svntest.wc.State(wc_dir, {
      'A/A/A'             : Item(status='  ', treeconflict='C'),
      'C/A'               : Item(status='  ', treeconflict='C'),
      'C/A/A'             : Item(status='  ', treeconflict='U'),
      'C/A/A/BB'          : Item(status='  ', treeconflict='A'),
+     'AAA_3/BB'          : Item(status='A '),
     })
 
   # This currently triggers an assertion failure

Modified: subversion/branches/ra-git/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/prop_tests.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/prop_tests.py Tue Dec 13 12:36:55
2016
@@ -2374,7 +2374,7 @@ def pristine_props_listed(sbox):
   svntest.actions.run_and_verify_svn(expected_output, [],
                                      'proplist', '-R', wc_dir, '-r', 'BASE')
 
-def create_inherited_ignores_config(config_dir):
+def create_inherited_ignores_config(sbox):
   "create config stuffs for inherited ignores tests"
 
   # contents of the file 'config'
@@ -2383,7 +2383,7 @@ def create_inherited_ignores_config(conf
 global-ignores = *.boo *.goo
 '''
 
-  svntest.main.create_config_dir(config_dir, config_contents)
+  return sbox.create_config_dir(config_contents)
 
 def inheritable_ignores(sbox):
   "inheritable ignores with svn:ignores and config"
@@ -2391,9 +2391,7 @@ def inheritable_ignores(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  tmp_dir = os.path.abspath(svntest.main.temp_dir)
-  config_dir = os.path.join(tmp_dir, 'autoprops_config_' + sbox.name)
-  create_inherited_ignores_config(config_dir)
+  config_dir = create_inherited_ignores_config(sbox)
 
   sbox.simple_propset(SVN_PROP_INHERITABLE_IGNORES, '*.doo', 'A/B')
   sbox.simple_propset(SVN_PROP_INHERITABLE_IGNORES, '*.moo', 'A/D')

Modified: subversion/branches/ra-git/subversion/tests/cmdline/resolve_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/resolve_tests.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/resolve_tests.py Tue Dec 13 12:36:55
2016
@@ -602,7 +602,6 @@ def multi_range_merge_with_accept(sbox):
 
 # Test for issue #4647 'auto resolution mine-full fails on binary file'
 @Issue(4647)
-@XFail()
 def automatic_binary_conflict_resolution(sbox):
   "resolve -R --accept [base | mf | tf] binary file"
 

Modified: subversion/branches/ra-git/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/stat_tests.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/stat_tests.py Tue Dec 13 12:36:55
2016
@@ -702,8 +702,6 @@ def timestamp_behaviour(sbox):
   text_time_behaviour(wc_dir, iota_path, 'iota', expected_status, 'cleanup')
 
   # Create a config to enable use-commit-times
-  config_dir = os.path.join(os.path.abspath(svntest.main.temp_dir),
-                            'use_commit_config')
   config_contents = '''\
 [auth]
 password-stores =
@@ -711,7 +709,7 @@ password-stores =
 [miscellany]
 use-commit-times = yes
 '''
-  svntest.main.create_config_dir(config_dir, config_contents)
+  config_dir = sbox.create_config_dir(config_contents)
 
   other_wc = sbox.add_wc_path('other')
   svntest.actions.run_and_verify_svn(None, [],

Modified: subversion/branches/ra-git/subversion/tests/cmdline/svntest/sandbox.py
URL: http://svn.apache.org/viewvc/subversion/branches/ra-git/subversion/tests/cmdline/svntest/sandbox.py?rev=1773992&r1=1773991&r2=1773992&view=diff
==============================================================================
--- subversion/branches/ra-git/subversion/tests/cmdline/svntest/sandbox.py (original)
+++ subversion/branches/ra-git/subversion/tests/cmdline/svntest/sandbox.py Tue Dec 13 12:36:55
2016
@@ -226,6 +226,20 @@ class Sandbox:
 
     return os.path.join(self.tmp_dir, '%s-%s' % (prefix, self.tempname_offs))
 
+  def create_config_dir(self, config_contents=None, server_contents=None,
+                        ssl_cert=None, ssl_url=None, http_proxy=None,
+                        exclusive_wc_locks=None):
+    """Create a config directory with specified or default files.
+       Return its path.
+    """
+
+    tmp_dir = os.path.abspath(svntest.main.temp_dir)
+    config_dir = os.path.join(tmp_dir, 'config_' + self.name)
+    svntest.main.create_config_dir(config_dir, config_contents, server_contents,
+                                   ssl_cert, ssl_url, http_proxy,
+                                   exclusive_wc_locks)
+    return config_dir
+
   def cleanup_test_paths(self):
     "Clean up detritus from this sandbox, and any dependents."
     if self.dependents:



Mime
View raw message