You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Neels Janosch Hofmeyr <ne...@elego.de> on 2008/08/21 03:30:23 UTC

tree-conflicts patch: split up new tc tests

[[[
Split up big tree-conflicts tests into smaller tests, because tree-
conflicts-with-directory-victims are still under development. They may
be joined back together when they merely serve as regression tests.

 * subversion/tests/cmdline/update_tests.py
     (tree_conflicts_on_update): Split into smaller functions.
     (tree_conflicts_on_update_1_1, tree_conflicts_on_update_1_2,
      tree_conflicts_on_update_2_1, tree_conflicts_on_update_2_2,
      tree_conflicts_on_update_3): New functions, as a result of
       splitting up tree_conflicts_on_update().

 * subversion/tests/cmdline/switch_tests.py
     (tree_conflicts_on_switch): Split into smaller functions.
     (tree_conflicts_on_switch_1_1, tree_conflicts_on_switch_1_2,
      tree_conflicts_on_switch_2_1, tree_conflicts_on_switch_2_2,
      tree_conflicts_on_switch_3): New functions, as a result of
       splitting up tree_conflicts_on_switch().

 * subversion/tests/cmdline/merge_tests.py
     (tree_conflicts_on_merge_local_ci,
      tree_conflicts_on_merge_no_local_ci): Fix use case numbering in
       comments from 1..3 to 4..6. Split into smaller functions.
     (tree_conflicts_on_merge_local_ci_4_1,
      tree_conflicts_on_merge_local_ci_4_2,
      tree_conflicts_on_merge_local_ci_5_1,
      tree_conflicts_on_merge_local_ci_5_2,
      tree_conflicts_on_merge_local_ci_6): New functions, as a result of
       splitting up tree_conflicts_on_merge_local_ci().
     (tree_conflicts_on_merge_no_local_ci_4_1,
      tree_conflicts_on_merge_no_local_ci_4_2,
      tree_conflicts_on_merge_no_local_ci_5_1,
      tree_conflicts_on_merge_no_local_ci_5_2,
      tree_conflicts_on_merge_no_local_ci_6): New functions, as a result
       of splitting up tree_conflicts_on_merge_no_local_ci().
]]]

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194


Re: tree-conflicts patch: split up new tc tests

Posted by Neels Janosch Hofmeyr <ne...@elego.de>.

Julian Foad wrote:
> On Thu, 2008-08-21 at 05:30 +0200, Neels Janosch Hofmeyr wrote:
>> [[[
>> Split up big tree-conflicts tests into smaller tests, because tree-
>> conflicts-with-directory-victims are still under development. They may
>> be joined back together when they merely serve as regression tests.
> 
> Looks great. Committed in r32613. Thanks.
> 
> (I added into the log message, for completeness, a mention of the
> abbreviations now moved to file-scope and the update of 'test_list'.)

Right, forgot about that.
Thanks!

-- 
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696  mobile: +49 177 2345869  fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194


Re: tree-conflicts patch: split up new tc tests

Posted by Julian Foad <ju...@btopenworld.com>.
On Thu, 2008-08-21 at 05:30 +0200, Neels Janosch Hofmeyr wrote:
> [[[
> Split up big tree-conflicts tests into smaller tests, because tree-
> conflicts-with-directory-victims are still under development. They may
> be joined back together when they merely serve as regression tests.

Looks great. Committed in r32613. Thanks.

(I added into the log message, for completeness, a mention of the
abbreviations now moved to file-scope and the update of 'test_list'.)

- Julian



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org