December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <web-client> master : fix eula tests (as now after succesfull finish is redirected to control panel) and add test for wizard envirement which is the one when eula the most often run.
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/master commit 796a5620e129751fdf73ae8464d6bce9a0c91cab Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 13:52:47 2009 +0100 fix eula tests (as now after succesfull finish is redirected to control panel) and add test for wizard envirement which is the one when eula the most often run. --- .../eulas/test/functional/eulas_controller_test.rb | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/plugins/eulas/test/functional/eulas_controller_test.rb b/plugins/eulas/test/functional/eulas_controller_test.rb index 8d91363..dcfd1c1 100644 --- a/plugins/eulas/test/functional/eulas_controller_test.rb +++ b/plugins/eulas/test/functional/eulas_controller_test.rb @@ -43,8 +43,8 @@ class EulasControllerTest < ActionController::TestCase @controller = EulasController.new # setup for eulas controller tests - @opensuse_eula = Eula.new ('openSUSE-11.1', false, ['en'], true) - @sles_eula = Eula.new ('SLES-11', false, ['en'], false) + @opensuse_eula = Eula.new('openSUSE-11.1', false, ['en'], true) + @sles_eula = Eula.new('SLES-11', false, ['en'], false) @proxy = Proxy.new([@opensuse_eula, @sles_eula], {:read=>true, :write=>true}) YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.eulas').returns(@proxy) @@ -71,7 +71,20 @@ class EulasControllerTest < ActionController::TestCase assert_redirected_to "/eulas/show/2" post :update, "accepted" => true, "id" => "2" assert((a)sles_eula.accepted) - assert_redirected_to "/eulas" # in basesystem redirected to "/controller/nextstep" + assert_redirected_to :controller => "controlpanel", :action => "index" + end + + def test_eula_step_in_wizard + session[:wizard_current] = "test" + session[:wizard_steps] = "systemtime,eulas,language" + @opensuse_eula.accepted = false + get :index + post :update, "accepted" => "false", "id" => "1" + post :update, "accepted" => "true", "id" => "1" + post :update, "accepted" => false, "id" => "2" + post :update, "accepted" => true, "id" => "2" + assert((a)sles_eula.accepted) + assert_redirected_to :controller => "controlpanel", :action => "nextstep" end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> backgroud_patches_bnc550934 : fix eula tests (as now after succesfull finish is redirected to control panel) and add test for wizard envirement which is the one when eula the most often run.
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 796a5620e129751fdf73ae8464d6bce9a0c91cab Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 13:52:47 2009 +0100 fix eula tests (as now after succesfull finish is redirected to control panel) and add test for wizard envirement which is the one when eula the most often run. --- .../eulas/test/functional/eulas_controller_test.rb | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/plugins/eulas/test/functional/eulas_controller_test.rb b/plugins/eulas/test/functional/eulas_controller_test.rb index 8d91363..dcfd1c1 100644 --- a/plugins/eulas/test/functional/eulas_controller_test.rb +++ b/plugins/eulas/test/functional/eulas_controller_test.rb @@ -43,8 +43,8 @@ class EulasControllerTest < ActionController::TestCase @controller = EulasController.new # setup for eulas controller tests - @opensuse_eula = Eula.new ('openSUSE-11.1', false, ['en'], true) - @sles_eula = Eula.new ('SLES-11', false, ['en'], false) + @opensuse_eula = Eula.new('openSUSE-11.1', false, ['en'], true) + @sles_eula = Eula.new('SLES-11', false, ['en'], false) @proxy = Proxy.new([@opensuse_eula, @sles_eula], {:read=>true, :write=>true}) YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.eulas').returns(@proxy) @@ -71,7 +71,20 @@ class EulasControllerTest < ActionController::TestCase assert_redirected_to "/eulas/show/2" post :update, "accepted" => true, "id" => "2" assert((a)sles_eula.accepted) - assert_redirected_to "/eulas" # in basesystem redirected to "/controller/nextstep" + assert_redirected_to :controller => "controlpanel", :action => "index" + end + + def test_eula_step_in_wizard + session[:wizard_current] = "test" + session[:wizard_steps] = "systemtime,eulas,language" + @opensuse_eula.accepted = false + get :index + post :update, "accepted" => "false", "id" => "1" + post :update, "accepted" => "true", "id" => "1" + post :update, "accepted" => false, "id" => "2" + post :update, "accepted" => true, "id" => "2" + assert((a)sles_eula.accepted) + assert_redirected_to :controller => "controlpanel", :action => "nextstep" end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : add test that system clock is properly set for ntp synchronize
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/master commit 0a7318a461be8c92587f9f6aa1a0bbbfde947b38 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 13:38:23 2009 +0100 add test that system clock is properly set for ntp synchronize --- .../test/functional/systemtime_controller_test.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/systemtime/test/functional/systemtime_controller_test.rb b/plugins/systemtime/test/functional/systemtime_controller_test.rb index e952e8c..0af6b97 100644 --- a/plugins/systemtime/test/functional/systemtime_controller_test.rb +++ b/plugins/systemtime/test/functional/systemtime_controller_test.rb @@ -127,7 +127,6 @@ class SystemtimeControllerTest < ActionController::TestCase session[:wizard_steps] = "systemtime,language" post :update, { :currenttime => "2009-07-02 - 12:18:00", :date => { :date => "2009-07-02 - 12:18:00/2009-07-02 - 12:18:00" }} - puts @response.body assert_response :redirect assert_redirected_to :controller => "controlpanel", :action => "nextstep" @@ -144,6 +143,7 @@ class SystemtimeControllerTest < ActionController::TestCase assert_response :redirect assert_redirected_to :controller => "controlpanel", :action => "index" assert ntpproxy.result.synchronize + assert !ntpproxy.result.synchronize_utc end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> backgroud_patches_bnc550934 : add test that system clock is properly set for ntp synchronize
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit 0a7318a461be8c92587f9f6aa1a0bbbfde947b38 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 13:38:23 2009 +0100 add test that system clock is properly set for ntp synchronize --- .../test/functional/systemtime_controller_test.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/systemtime/test/functional/systemtime_controller_test.rb b/plugins/systemtime/test/functional/systemtime_controller_test.rb index e952e8c..0af6b97 100644 --- a/plugins/systemtime/test/functional/systemtime_controller_test.rb +++ b/plugins/systemtime/test/functional/systemtime_controller_test.rb @@ -127,7 +127,6 @@ class SystemtimeControllerTest < ActionController::TestCase session[:wizard_steps] = "systemtime,language" post :update, { :currenttime => "2009-07-02 - 12:18:00", :date => { :date => "2009-07-02 - 12:18:00/2009-07-02 - 12:18:00" }} - puts @response.body assert_response :redirect assert_redirected_to :controller => "controlpanel", :action => "nextstep" @@ -144,6 +143,7 @@ class SystemtimeControllerTest < ActionController::TestCase assert_response :redirect assert_redirected_to :controller => "controlpanel", :action => "index" assert ntpproxy.result.synchronize + assert !ntpproxy.result.synchronize_utc end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : fix test suite to test new behavior (no longer force UTC if ntp is called) fix depracated warning
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/master commit e65f6c415f9a06b612efd8a2bd8e4cb5518e7c84 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 13:34:32 2009 +0100 fix test suite to test new behavior (no longer force UTC if ntp is called) fix depracated warning --- .../test/functional/systemtime_controller_test.rb | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/systemtime/test/functional/systemtime_controller_test.rb b/plugins/systemtime/test/functional/systemtime_controller_test.rb index 2ce2a9a..e952e8c 100644 --- a/plugins/systemtime/test/functional/systemtime_controller_test.rb +++ b/plugins/systemtime/test/functional/systemtime_controller_test.rb @@ -20,10 +20,11 @@ class SystemtimeControllerTest < ActionController::TestCase end class Ntp - attr_accessor :synchronize + attr_accessor :synchronize, :synchronize_utc def initialize @synchronize = false + @synchronize_utc = true end def save @@ -114,7 +115,7 @@ class SystemtimeControllerTest < ActionController::TestCase YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.time').returns(@proxy) post :update, { :currenttime => "2009-07-02 - 12:18:00", :date => { :date => "2009-07-02 - 12:18:00/2009-07-02 - 12:18:00" } } assert_response :redirect - assert_redirected_to :action => "index" + assert_redirected_to :controller => "controlpanel", :action => "index" assert @result.saved assert_equal "localtime",(a)result.utcstatus @@ -134,16 +135,15 @@ class SystemtimeControllerTest < ActionController::TestCase assert_equal "localtime",(a)result.utcstatus end - def test_ntp_force_utc + def test_ntp_force YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.time').returns(@proxy) ntpproxy = NtpProxy.new ntpproxy.result = Ntp.new YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.ntp').returns(ntpproxy) post :update, { :timeconfig => "ntp_sync" } assert_response :redirect - assert_redirected_to :action => "index" + assert_redirected_to :controller => "controlpanel", :action => "index" assert ntpproxy.result.synchronize - assert_equal "UTC", @result.utcstatus end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> backgroud_patches_bnc550934 : fix test suite to test new behavior (no longer force UTC if ntp is called) fix depracated warning
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/backgroud_patches_bnc550934 commit e65f6c415f9a06b612efd8a2bd8e4cb5518e7c84 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 13:34:32 2009 +0100 fix test suite to test new behavior (no longer force UTC if ntp is called) fix depracated warning --- .../test/functional/systemtime_controller_test.rb | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/systemtime/test/functional/systemtime_controller_test.rb b/plugins/systemtime/test/functional/systemtime_controller_test.rb index 2ce2a9a..e952e8c 100644 --- a/plugins/systemtime/test/functional/systemtime_controller_test.rb +++ b/plugins/systemtime/test/functional/systemtime_controller_test.rb @@ -20,10 +20,11 @@ class SystemtimeControllerTest < ActionController::TestCase end class Ntp - attr_accessor :synchronize + attr_accessor :synchronize, :synchronize_utc def initialize @synchronize = false + @synchronize_utc = true end def save @@ -114,7 +115,7 @@ class SystemtimeControllerTest < ActionController::TestCase YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.time').returns(@proxy) post :update, { :currenttime => "2009-07-02 - 12:18:00", :date => { :date => "2009-07-02 - 12:18:00/2009-07-02 - 12:18:00" } } assert_response :redirect - assert_redirected_to :action => "index" + assert_redirected_to :controller => "controlpanel", :action => "index" assert @result.saved assert_equal "localtime",(a)result.utcstatus @@ -134,16 +135,15 @@ class SystemtimeControllerTest < ActionController::TestCase assert_equal "localtime",(a)result.utcstatus end - def test_ntp_force_utc + def test_ntp_force YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.time').returns(@proxy) ntpproxy = NtpProxy.new ntpproxy.result = Ntp.new YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.ntp').returns(ntpproxy) post :update, { :timeconfig => "ntp_sync" } assert_response :redirect - assert_redirected_to :action => "index" + assert_redirected_to :controller => "controlpanel", :action => "index" assert ntpproxy.result.synchronize - assert_equal "UTC", @result.utcstatus end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60067 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: rhafer Date: Fri Dec 11 13:33:10 2009 New Revision: 60067 URL: http://svn.opensuse.org/viewcvs/yast?rev=60067&view=rev Log: updated changelog Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Fri Dec 11 13:33:10 2009 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Dec 11 12:30:01 UTC 2009 - rhafer(a)novell.com + +- make sure the syncrepl rid is unique accross the server, when + setting up a new syncrepl client (bnc#561857) +- fixed the Add Database Wizard workflow. It was not possible to + create a new Database once the initial server setup completed + (bnc#563932) + +------------------------------------------------------------------- Fri Dec 4 14:56:30 UTC 2009 - rhafer(a)novell.com - Version 2.17.25 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60066 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp
by rhafer＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: rhafer Date: Fri Dec 11 13:33:07 2009 New Revision: 60066 URL: http://svn.opensuse.org/viewcvs/yast?rev=60066&view=rev Log: Fix Database-add Wizard (bnc#563932) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp Fri Dec 11 13:33:07 2009 @@ -1992,7 +1992,7 @@ ], "syncrepl" : $[ `next : "ppolicy", - `syncrepl : "last", + `syncrepl : `next, `abort : `abort ], "ppolicy" : $[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60065 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc
by rhafer＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: rhafer Date: Fri Dec 11 13:27:24 2009 New Revision: 60065 URL: http://svn.opensuse.org/viewcvs/yast?rev=60065&view=rev Log: Take care that the syncrepl rid is unique accross the server (bnc#561857) Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/agent/SlapdConfigAgent.cc Fri Dec 11 13:27:24 2009 @@ -1734,6 +1734,25 @@ { sr = boost::shared_ptr<OlcSyncRepl>(new OlcSyncRepl()); srl.push_back(sr); + + // find available rid (rid must be unique accross the server) + OlcDatabaseList::const_iterator k; + int largest_rid=0; + for ( k = databases.begin(); k != databases.end() ; k++ ) + { + OlcSyncReplList srl1 = (*k)->getSyncRepl(); + if ( srl1.empty() ) + { + continue; + } + boost::shared_ptr<OlcSyncRepl> sr1; + int currid = (*srl1.begin())->getRid(); + if ( currid > largest_rid ) + { + largest_rid=currid; + } + } + sr->setRid(largest_rid+1); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> jr-basemodel : Ntp plugin now use rest-service ancestor
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/jr-basemodel commit ccf3a31ffe1abe0c5a0da47a01992ebfba25224b Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 12:58:32 2009 +0100 Ntp plugin now use rest-service ancestor --- plugins/ntp/app/controllers/ntp_controller.rb | 14 +++----------- plugins/ntp/app/models/ntp.rb | 13 ++++++++----- plugins/ntp/test/functional/ntp_controller_test.rb | 6 +++--- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/plugins/ntp/app/controllers/ntp_controller.rb b/plugins/ntp/app/controllers/ntp_controller.rb index 8af3666..f274cfe 100644 --- a/plugins/ntp/app/controllers/ntp_controller.rb +++ b/plugins/ntp/app/controllers/ntp_controller.rb @@ -1,4 +1,3 @@ - class NtpController < ApplicationController before_filter :login_required @@ -7,8 +6,8 @@ class NtpController < ApplicationController ntp = Ntp.find respond_to do |format| - format.xml { render :xml => ntp.actions.to_xml(:root => :actions)} - format.json { render :json => ntp.actions.to_json } + format.xml { render :xml => ntp.to_xml} + format.json { render :json => ntp.to_json } end end @@ -18,14 +17,7 @@ class NtpController < ApplicationController raise InvalidParameters.new :ntp => "Missing" end - @ntp = Ntp.find - - if root["synchronize"] - yapi_perm_check "ntp.synchronize" - @ntp.actions[:synchronize] = true - end - - @ntp.save + Ntp.new(root).save show end diff --git a/plugins/ntp/app/models/ntp.rb b/plugins/ntp/app/models/ntp.rb index c57115f..ee89f8d 100644 --- a/plugins/ntp/app/models/ntp.rb +++ b/plugins/ntp/app/models/ntp.rb @@ -1,10 +1,15 @@ -class Ntp +class Ntp < BaseModel::Base attr_accessor :actions + validates_inclusion_of :'actions[:synchronize]', :in => [ true, false ], :allow_nil => true + + before_save { yapi_perm_check "ntp.synchronize" if actions[:synchronize] } + public - def initialize + def initialize(args={}) @actions = { :synchronize => false } + super args end def self.find @@ -12,9 +17,7 @@ class Ntp end def save - if @actions[:synchronize] - synchronize - end + synchronize if @actions[:synchronize] end private diff --git a/plugins/ntp/test/functional/ntp_controller_test.rb b/plugins/ntp/test/functional/ntp_controller_test.rb index 9709de5..364f845 100644 --- a/plugins/ntp/test/functional/ntp_controller_test.rb +++ b/plugins/ntp/test/functional/ntp_controller_test.rb @@ -19,18 +19,18 @@ class SystemControllerTest < ActionController::TestCase ret = get :show assert_response :success response = Hash.from_xml(ret.body) - assert response["actions"]["synchronize"] == false + assert response["ntp"]["actions"]["synchronize"] == false end def test_update YastService.stubs(:Call).with("YaPI::NTP::Synchronize").once.returns("OK") - post :update, {"ntp"=>{"synchronize"=>true}} + post :update, {"ntp"=>{"actions" => {"synchronize"=>true}}} assert_response :success end def test_update_failed YastService.stubs(:Call).with("YaPI::NTP::Synchronize").once.returns("Failed") - post :update, {"ntp"=>{"synchronize"=>true}} + post :update, {"ntp"=>{"actions" => {"synchronize"=>true}}} assert_response 503 end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0