Author: schubi2 Date: Tue Sep 2 11:08:39 2008 New Revision: 10910 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10910&view=rev Log: enabled SAT distupgrade Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-queue-tests/ignore Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/ignore trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/notsupported-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-version-cap-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-multiple-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/ignore Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/ignore URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/ignore?rev=10910&r1=10909&r2=10910&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/ignore (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/ignore Tue Sep 2 11:08:39 2008 @@ -5,3 +5,7 @@ exercise-bug150844-test.xml #unmaintained packages does not fit due vendor checking anymore unmaintained-single-test.xml +#has to be checked (distupgrade due the SAT solver) +bug400422-test.xml +10_2-i386-update-test.xml +394367-test.xml \ No newline at end of file Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/notsupported-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/notsupported-test.solution?rev=10910&r1=10909&r2=10910&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/notsupported-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/notsupported-test.solution Tue Sep 2 11:08:39 2008 @@ -1,7 +1,7 @@
!> Doing distribution upgrade ... ->!> 1: I_Tu_(2)A-1.0-1.noarch(@System) +>!> 1: I_Ts_(2)A-1.0-1.noarch(@System) !> 2: I_TsU(3)B-1.0-1.noarch(@System) ->!> 3: U_Th_(5)B-2.0-1.noarch(upgrade) +>!> 3: U_Ts_(5)B-2.0-1.noarch(upgrade) !> 4: I__s_(4)C-1.0-1.noarch(@System) !> No problems so far !> Solution :
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution?rev=10910&r1=10909&r2=10910&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution Tue Sep 2 11:08:39 2008 @@ -1,6 +1,6 @@
!> Doing distribution upgrade ... !> 1: I_Ts_(2)A-1.0-1.noarch(@System) ->!> 2: U_Th_(4)A2-2.0-1.noarch(upgrade) +>!> 2: U_Ts_(4)A2-2.0-1.noarch(upgrade) !> 3: U__s_(3)A_new-2.0-1.noarch(upgrade) !> Solution : !> install A2-2.0-1.noarch[upgrade]
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution?rev=10910&r1=10909&r2=10910&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution Tue Sep 2 11:08:39 2008 @@ -1,6 +1,6 @@
!> Doing distribution upgrade ... !> 1: I_Ts_(2)A-1.0-1.noarch(@System) ->!> 2: U_Th_(4)A2-2.0-1.noarch(upgrade) +>!> 2: U_Ts_(4)A2-2.0-1.noarch(upgrade) !> 3: U__s_(3)A_new-2.0-1.noarch(upgrade) !> Solution : !> install A2-2.0-1.noarch[upgrade]
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution?rev=10910&r1=10909&r2=10910&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution Tue Sep 2 11:08:39 2008 @@ -1,6 +1,6 @@
!> Doing distribution upgrade ... ->!> 1: I_Th_(2)A-1.0-1.noarch(@System) ->!> 2: U_Th_(3)A_new-2.0-1.noarch(upgrade) +>!> 1: I_Ts_(2)A-1.0-1.noarch(@System) +>!> 2: U_Ts_(3)A_new-2.0-1.noarch(upgrade) !> Solution : !> install A_new-2.0-1.noarch[upgrade] !> delete A-1.0-1.noarch
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-version-cap-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-version-cap-test.solution?rev=10910&r1=10909&r2=10910&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-version-cap-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/rename-version-cap-test.solution Tue Sep 2 11:08:39 2008 @@ -1,8 +1,8 @@
!> Doing distribution upgrade ... ->!> 1: I_Th_(2)A-1.0-1.noarch(@System) ->!> 2: U_Th_(4)A_new-2.0-1.noarch(upgrade) ->!> 3: I_Th_(3)B-1.0-1.noarch(@System) ->!> 4: U_Th_(5)B_new-2.0-1.noarch(upgrade) +>!> 1: I_Ts_(2)A-1.0-1.noarch(@System) +>!> 2: U_Ts_(4)A_new-2.0-1.noarch(upgrade) +>!> 3: I_Ts_(3)B-1.0-1.noarch(@System) +>!> 4: U_Ts_(5)B_new-2.0-1.noarch(upgrade) !> 5: U__s_(6)C_new-2.0-1.noarch(upgrade) !> Solution : !> install A_new-2.0-1.noarch[upgrade]
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-multiple-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-multiple-test.solution?rev=10910&r1=10909&r2=10910&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-multiple-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-multiple-test.solution Tue Sep 2 11:08:39 2008 @@ -1,7 +1,7 @@
!> Doing distribution upgrade ... !> 1: I_TsU(2)A-1.0-1.noarch(@System) !> 2: U__s_(3)A-2.0-1.noarch(upgrade1) ->!> 3: U_Th_(4)A-2.0-2.noarch(upgrade2) +>!> 3: U_Ts_(4)A-2.0-2.noarch(upgrade2) !> Solution : !> install A-2.0-2.noarch[upgrade2] !> update A-1.0-1.noarch
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution?rev=10910&r1=10909&r2=10910&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution Tue Sep 2 11:08:39 2008 @@ -1,6 +1,6 @@
!> Doing distribution upgrade ... !> 1: I_TsU(2)A-1.0-1.noarch(@System) ->!> 2: U_Th_(3)A-2.0-1.noarch(upgrade) +>!> 2: U_Ts_(3)A-2.0-1.noarch(upgrade) !> Solution : !> install A-2.0-1.noarch[upgrade] !> update A-1.0-1.noarch
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-queue-tests/ignore URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-queue-tests/ignore?rev=10910&view=auto ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-queue-tests/ignore (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-queue-tests/ignore Tue Sep 2 11:08:39 2008 @@ -0,0 +1,2 @@ +# due noupdateprovide = 0 +obsoletes-test.xml \ No newline at end of file Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/ignore URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/ignore?rev=10910&r1=10909&r2=10910&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/ignore (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/ignore Tue Sep 2 11:08:39 2008 @@ -6,4 +6,6 @@ # having no ignore solution conflict3-test.xml remove-still-needed1-test.xml -require-test.xml \ No newline at end of file +require-test.xml +#vendor check is disabled while distupgrade +vendor-test.xml \ No newline at end of file -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org