From: Adrian Schröter --- src/api/test/functional/source_controller_test.rb | 7 ++----- src/api/test/functional/source_services_test.rb | 4 +--- src/backend/bs_srcserver | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/api/test/functional/source_controller_test.rb b/src/api/test/functional/source_controller_test.rb index 4460c97..c0fb47b 100644 --- a/src/api/test/functional/source_controller_test.rb +++ b/src/api/test/functional/source_controller_test.rb @@ -1669,10 +1669,7 @@ end assert_response :success assert_tag :tag => "revisionlist", :children => { :count => 1 } - delete "/source/home:fred/DELETE" - assert_response :success - -# FIXME2.3: this support needs a rethink in backend +# FIXME: this is not yet supported in backend if $ENABLE_BROKEN_TEST # copy with history post "/source/home:fred/DELETE", :cmd => :copy, :oproject => "home:Iggy", :opackage => "TestPack", :withhistory => "1" @@ -1680,11 +1677,11 @@ if $ENABLE_BROKEN_TEST get "/source/home:fred/DELETE/_history" assert_response :success assert_tag :tag => "revisionlist", :children => { :count => revision } +end # cleanup delete "/source/home:fred/DELETE" assert_response :success -end delete "/source/home:Iggy/TestPack/filename" assert_response :success end diff --git a/src/api/test/functional/source_services_test.rb b/src/api/test/functional/source_services_test.rb index 2329130..4d0c969 100644 --- a/src/api/test/functional/source_services_test.rb +++ b/src/api/test/functional/source_services_test.rb @@ -217,9 +217,7 @@ class SourceServicesTest < ActionController::IntegrationTest wait_for_service( "home:tom", "service2" ) get "/source/home:tom/service2" assert_response :success -# FIXME2.3: use this when switching to new service mode -# assert_tag :tag => "serviceinfo", :attributes => { :code => 'succeeded' } - assert_no_tag :tag => "serviceinfo", :attributes => { :code => 'failed' } + assert_tag :tag => "serviceinfo", :attributes => { :code => 'succeeded' } assert_no_tag :parent => { :tag => "serviceinfo" }, :tag => "error" get "/source/home:tom/service2/_service:set_version:pack.spec?expand=1" assert_response :success diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver index 44ed5da..783a9ac 100755 --- a/src/backend/bs_srcserver +++ b/src/backend/bs_srcserver @@ -6423,7 +6423,7 @@ my $dispatches = [ 'POST:/source/$project/$package cmd=servicediff rev? unified:bool? file:filename* filelimit:num? tarlimit:num? view:?' => \&servicediff, 'POST:/source/$project/$package cmd=commit rev? user:? comment:? keeplink:bool? repairlink:bool? linkrev? setrev:bool? noservice:bool?' => \&sourcecommit, 'POST:/source/$project/$package cmd=commitfilelist rev? user:? comment:? keeplink:bool? repairlink:bool? linkrev? setrev:bool? requestid:num? time:num? version:? vrev:? noservice:bool? servicemark:?' => \&sourcecommitfilelist, - 'POST:/source/$project/$package cmd=copy rev? user:? comment:? orev:rev? oproject:project? opackage:package? expand:bool? keeplink:bool? repairlink:bool? linkrev? setrev:linkrev? olinkrev:linkrev? requestid:num? dontupdatesource:bool? withhistory:bool? noservice:bool?' => \&sourcecopy, + 'POST:/source/$project/$package cmd=copy rev? user:? comment:? orev:rev? oproject:project? opackage:package? expand:bool? keeplink:bool? repairlink:bool? linkrev? setrev:linkrev? olinkrev:linkrev? requestid:num? dontupdatesource:bool? noservice:bool?' => \&sourcecopy, 'POST:/source/$project/$package cmd=branch rev? user:? comment:? orev:rev? oproject:project? opackage:package? olinkrev:linkrev? requestid:num? force:bool? keepcontent:bool?' => \&sourcebranch, 'POST:/source/$project/$package cmd=linktobranch rev? user:? comment:? linkrev?' => \&linktobranch, 'POST:/source/$project/$package cmd=deleteuploadrev' => \&deleteuploadrev, -- 1.7.7 -- To unsubscribe, e-mail: obs-commits+unsubscribe@opensuse.org To contact the owner, e-mail: obs-commits+owner@opensuse.org