June 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] rest-service : branch, master, updated.
by git version control 30 Jun '09

30 Jun '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "YaST web service". The branch, master has been updated via b602a5bf3598020b329faf39501c30e9d677a199 (commit) via cbcf41951a8dd236913c2d8ade90a507a628fef8 (commit) from 647af391acaac3676d0c501678efca61fcb2d7c0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b602a5bf3598020b329faf39501c30e9d677a199 Merge: cbcf41951a8dd236913c2d8ade90a507a628fef8 647af391acaac3676d0c501678efca61fcb2d7c0 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Jun 30 12:24:53 2009 +0200 Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service commit cbcf41951a8dd236913c2d8ade90a507a628fef8 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Jun 30 12:24:40 2009 +0200 added testcases for permissions ----------------------------------------------------------------------- Summary of changes and diff: .../app/controllers/permissions_controller.rb | 2 +- webservice/test/functional/permissions_test.rb | 91 ++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletions(-) create mode 100644 webservice/test/functional/permissions_test.rb diff --git a/webservice/app/controllers/permissions_controller.rb b/webservice/app/controllers/permissions_controller.rb index 2983b26..6319a2f 100644 --- a/webservice/app/controllers/permissions_controller.rb +++ b/webservice/app/controllers/permissions_controller.rb @@ -113,7 +113,7 @@ class PermissionsController < ApplicationController break end end - if @permission.name.blank? + if permission.name.blank? render ErrorResult.error(404, 1, "Permission: #{right} not found.") and return end diff --git a/webservice/test/functional/permissions_test.rb b/webservice/test/functional/permissions_test.rb new file mode 100644 index 0000000..6251ab6 --- /dev/null +++ b/webservice/test/functional/permissions_test.rb @@ -0,0 +1,91 @@ +require File.expand_path(File.dirname(__FILE__) + "/../test_helper") +require 'test/unit' +require 'rubygems' +require "scr" +require 'mocha' + + +class PermissionsControllerTest < ActionController::TestCase + fixtures :accounts + def setup + @controller = PermissionsController.new + @request = ActionController::TestRequest.new + # http://railsforum.com/viewtopic.php?id=1719 + @request.session[:account_id] = 1 # defined in fixtures + Scr.any_instance.stubs(:execute).with(["polkit-action"]).returns({:stderr=>"", :exit=>0, :stdout=>"org.opensuse.yast.system.users.read\norg.opensuse.yast.system.users.write\norg.opensuse.yast.system.users.new\norg.opensuse.yast.system.users.delete\n"}) + Scr.any_instance.stubs(:execute).with(["polkit-auth", "--user", "schubi", "--explicit"]).returns(:stderr=>"", :exit=>0, :stdout=>"org.opensuse.yast.system.users.read\norg.opensuse.yast.system.users.write\norg.opensuse.yast.system.users.new\n") + Scr.any_instance.stubs(:execute).with(['polkit-auth', '--user', 'schubi', '--grant', 'org.opensuse.yast.patch.install']).returns({:stderr=>"", :exit=>0, :stdout=>""}) + end + + test "access index" do + get :index, :user_id => "schubi" + assert_response :success + end + + test "access index xml" do + mime = Mime::XML + @request.accept = mime.to_s + get :index, :user_id => "schubi", :format => :xml + assert_equal mime.to_s, @response.content_type + end + + test "access index json" do + mime = Mime::JSON + @request.accept = mime.to_s + get :index, :user_id => "schubi", :format => :json + assert_equal mime.to_s, @response.content_type + end + + test "access index without user" do + get :index + assert_response 404 + end + + test "access index with wrong user" do + Scr.any_instance.stubs(:execute).with(["polkit-auth", "--user", "not avail", "--explicit"]).returns({:stderr=>"polkit-auth: cannot look up uid for user 'not avail'\n", :exit=>1, :stdout=>""}) + get :index, :user_id => "not avail" + assert_response 404 + end + + test "access show" do + get :show, :id => "org.opensuse.yast.system.users.read", :user_id => "schubi" + assert_response :success + end + + test "access show without right" do + get :show, :user_id => "schubi" + assert_response 404 + end + + test "access show without user" do + get :show, :id => "org.opensuse.yast.system.users.read" + assert_response 404 + end + + test "access show without user AND right" do + get :show + assert_response 404 + end + + test "setting permissions" do + put :update, :permissions => {"name"=>"org.opensuse.yast.patch.install", "id"=>"schubi", "grant"=>true}, :id=>"schubi.xml" + assert_response :success + end + + test "setting permissions without permissions" do + put :update, :id=>"schubi.xml" + assert_response 404 + end + + test "setting permissions without user" do + put :update, :permissions => {"name"=>"org.opensuse.yast.patch.install", "id"=>"schubi", "grant"=>true} + assert_response 404 + end + + test "setting permissions returns false from polkit-auth" do + Scr.any_instance.stubs(:execute).with(['polkit-auth', '--user', 'schubi', '--grant', 'org.opensuse.yast.patch.install']).returns({:stderr=>"error", :exit=>1, :stdout=>""}) + put :update, :permissions => {"name"=>"org.opensuse.yast.patch.install", "id"=>"schubi", "grant"=>true}, :id=>"schubi.xml" + assert_response 404 + end + +end hooks/post-receive -- YaST web service -- 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] r57801 - in /branches/SuSE-Code-11-Branch/registration: VERSION package/yast2-registration.changes
by jdsn＠svn.opensuse.org 30 Jun '09

30 Jun '09

Author: jdsn Date: Tue Jun 30 12:20:38 2009 New Revision: 57801 URL: http://svn.opensuse.org/viewcvs/yast?rev=57801&view=rev Log: new version 2.17.25 Modified: branches/SuSE-Code-11-Branch/registration/VERSION branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes Modified: branches/SuSE-Code-11-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/registrat… ============================================================================== --- branches/SuSE-Code-11-Branch/registration/VERSION (original) +++ branches/SuSE-Code-11-Branch/registration/VERSION Tue Jun 30 12:20:38 2009 @@ -1 +1 @@ -2.17.24 +2.17.25 Modified: branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/registrat… ============================================================================== --- branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes Tue Jun 30 12:20:38 2009 @@ -2,6 +2,7 @@ Thu Apr 23 21:14:23 CEST 2009 - jdsn(a)suse.de - check boolean values also for nil to prevent crashes (bnc#463800) +- 2.17.25 ------------------------------------------------------------------- Thu Apr 9 17:43:26 CEST 2009 - jdsn(a)suse.de -- 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] r57800 - in /trunk/autoinstallation: doc/Installation.xml package/autoyast2.changes src/modules/AutoInstall.ycp
by ug＠svn.opensuse.org 30 Jun '09

30 Jun '09

Author: ug Date: Tue Jun 30 12:11:05 2009 New Revision: 57800 URL: http://svn.opensuse.org/viewcvs/yast?rev=57800&view=rev Log: <filename> option added to the <pxe> section Modified: trunk/autoinstallation/doc/Installation.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoInstall.ycp Modified: trunk/autoinstallation/doc/Installation.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Installatio… ============================================================================== --- trunk/autoinstallation/doc/Installation.xml (original) +++ trunk/autoinstallation/doc/Installation.xml Tue Jun 30 12:11:05 2009 @@ -199,6 +199,7 @@ </pxelinux-config> <tftp-server>192.168.66.1</tftp-server> <pxelinux-dir>/pxelinux.cfg</pxelinux-dir> + <filename>__MAC__</filename>  </pxe> ]]> </screen> @@ -216,6 +217,11 @@ reboot and if you want to do another autoinstallation for that machine, you have to remove the file from the TFTP server. </para> + <para> + Since openSUSE 11.2 (not SLES11) you can configure the filename too that will be uploaded. + If you use the "magic" __MAC__ filename, the filename will be the mac address of your machine like this "01-08-00-27-79-49-ee". + A missing filename creates the IP address filename like in the past. + </para> </section> </section> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Jun 30 12:11:05 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jun 30 11:35:23 CEST 2009 - ug(a)suse.de + +- <filename> option added to the <pxe> section + +------------------------------------------------------------------- Mon Jun 29 13:34:11 CEST 2009 - ug(a)suse.de - <pxe> schema file added Modified: trunk/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstall.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstall.ycp Tue Jun 30 12:11:05 2009 @@ -199,10 +199,16 @@ string tmpdir = (string)SCR::Read(.target.tmpdir); string hexfile = sformat("%1/%2", tmpdir, AutoInstallRules::hostid ); map pxe = Profile::current["pxe"]:$[]; + string dest_file = pxe["filename"]:AutoInstallRules::hostid; + if( dest_file == "__MAC__" ) { + string mac = AutoInstallRules::mac; + dest_file = sformat ("01-%1-%2-%3-%4-%5-%6", substring(mac,0,2), substring(mac,2,2), substring(mac,4,2), + substring(mac,6,2), substring(mac,8,2), substring(mac,10,2)); + } string server = pxe["tftp-server"]:""; if (server!="" && pxe["pxe_localboot"]:false) { - y2milestone("putting pxe local boot file on server :%1", server); + y2milestone("putting pxe local boot file '%2' on server :%1", server, dest_file); string config = pxe["pxelinux-config"]:""; string dir = pxe["pxelinux-dir"]:"pxelinux.cfg"; if (config == "") @@ -212,8 +218,7 @@ SCR::Write(.target.string, hexfile, config); - return TFTP::Put(server, dir + "/" + AutoInstallRules::hostid, - hexfile ); + return TFTP::Put(server, dir + "/" + dest_file, hexfile ); } return true; } -- 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] r57799 - /branches/tmp/SLE-11-WebYaST/
by mvidner＠svn.opensuse.org 30 Jun '09

30 Jun '09

Author: mvidner Date: Tue Jun 30 11:44:41 2009 New Revision: 57799 URL: http://svn.opensuse.org/viewcvs/yast?rev=57799&view=rev Log: Created WebYaST branch. To be merged back to branches/SuSE-Code-11-Branch when the contents is tested not to break SLE. Added: branches/tmp/SLE-11-WebYaST/ - copied from r57798, branches/SuSE-Code-11-Branch/ -- 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 : branch, master, updated.
by git version control 30 Jun '09

30 Jun '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "YaST web service". The branch, master has been updated via 647af391acaac3676d0c501678efca61fcb2d7c0 (commit) from eb85d3bbcbee0cf46d4c08812369a09d91775b4a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 647af391acaac3676d0c501678efca61fcb2d7c0 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Jun 30 10:33:34 2009 +0200 solve testing controller fields without getter ----------------------------------------------------------------------- Summary of changes and diff: .../app/controllers/language_controller.rb | 1 - .../test/functional/language_controller_test.rb | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/language/app/controllers/language_controller.rb b/plugins/language/app/controllers/language_controller.rb index c4729eb..de95cfc 100644 --- a/plugins/language/app/controllers/language_controller.rb +++ b/plugins/language/app/controllers/language_controller.rb @@ -3,7 +3,6 @@ include ApplicationHelper class LanguageController < ApplicationController before_filter :login_required - attr_reader :language #-------------------------------------------------------------------------------- # # actions diff --git a/plugins/language/test/functional/language_controller_test.rb b/plugins/language/test/functional/language_controller_test.rb index 25a931a..5fc57a7 100644 --- a/plugins/language/test/functional/language_controller_test.rb +++ b/plugins/language/test/functional/language_controller_test.rb @@ -65,9 +65,9 @@ class LanguageControllerTest < ActionController::TestCase def check_update_result assert_response :success - assert_equal @controller.language.language, Data[:language][:current] - assert_equal @controller.language.utf8, Data[:language][:utf8] - assert_equal @controller.language.rootlocale, Data[:language][:rootlocale] + assert_equal assigns["language"].language, Data[:language][:current] + assert_equal assigns["language"].utf8, Data[:language][:utf8] + assert_equal assigns["language"].rootlocale, Data[:language][:rootlocale] end def test_update_noparams hooks/post-receive -- YaST web service -- 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] r57798 - /branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/modules/AutoinstLVM.ycp
by ug＠svn.opensuse.org 30 Jun '09

30 Jun '09

Author: ug Date: Tue Jun 30 10:21:44 2009 New Revision: 57798 URL: http://svn.opensuse.org/viewcvs/yast?rev=57798&view=rev Log: la la la Modified: branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Tue Jun 30 10:21:44 2009 @@ -376,6 +376,7 @@ string use = volume_group["use"]:"none"; boolean lvm2 = volume_group["lvm2"]:true; string lvm_string = lvm2 ? "lvm2" : "lvm"; + integer pesize = volume_group["pesize"]:1; string vgname = substring(device, 5); current_vg = vgname; -- 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 : branch, master, updated.
by git version control 30 Jun '09

30 Jun '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "YaST web service". The branch, master has been updated via eb85d3bbcbee0cf46d4c08812369a09d91775b4a (commit) via 697c19aa0495a8771483851516d1624c7d5e0883 (commit) via 2451d9d20f6fa574861309ce70a10323a35cf8c7 (commit) from e314f09ab1b3dde10d0b434ccf5312e53199ffe1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit eb85d3bbcbee0cf46d4c08812369a09d91775b4a Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Jun 30 10:19:21 2009 +0200 complete testsuite commit 697c19aa0495a8771483851516d1624c7d5e0883 Merge: 2451d9d20f6fa574861309ce70a10323a35cf8c7 e314f09ab1b3dde10d0b434ccf5312e53199ffe1 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Tue Jun 30 10:19:08 2009 +0200 Merge branch 'master' of git@git.opensuse.org:projects/yast/rest-service commit 2451d9d20f6fa574861309ce70a10323a35cf8c7 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Jun 29 15:05:37 2009 +0200 improve test suite ----------------------------------------------------------------------- Summary of changes and diff: plugins/language/Rakefile | 21 ---- .../app/controllers/language_controller.rb | 6 +- .../test/functional/language_controller_test.rb | 97 +++++++++++++++----- plugins/language/test/unit/language_test.rb | 66 ++++++++++--- 4 files changed, 128 insertions(+), 62 deletions(-) diff --git a/plugins/language/Rakefile b/plugins/language/Rakefile index fc62167..aac07dc 100644 --- a/plugins/language/Rakefile +++ b/plugins/language/Rakefile @@ -9,15 +9,6 @@ require 'tasks/rails' desc 'Default: run unit tests.' task :default => :test -desc 'Test the language plugin.' -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.libs << 'test' - t.libs << RailsParent.parent - t.pattern = 'test/**/*_test.rb' - t.verbose = true -end - desc 'Generate documentation for the language plugin.' Rake::RDocTask.new(:rdoc) do |rdoc| rdoc.rdoc_dir = 'rdoc' @@ -36,15 +27,3 @@ Rake::PackageTask.new('www', :noversion) do |p| p.package_files.exclude('package') p.package_files.exclude('nbproject') end - -desc "install policies" -task :install do |t| - Dir.glob("**/*.policy").each do |policy| - sudo "cp #{policy} /usr/share/PolicyKit/policy" - end -end - -def sudo(cmd) - puts "#{cmd}" - %x[sudo -p "Password: " #{cmd}] -end diff --git a/plugins/language/app/controllers/language_controller.rb b/plugins/language/app/controllers/language_controller.rb index 8d533ea..c4729eb 100644 --- a/plugins/language/app/controllers/language_controller.rb +++ b/plugins/language/app/controllers/language_controller.rb @@ -3,7 +3,7 @@ include ApplicationHelper class LanguageController < ApplicationController before_filter :login_required - + attr_reader :language #-------------------------------------------------------------------------------- # # actions @@ -11,12 +11,12 @@ class LanguageController < ApplicationController #-------------------------------------------------------------------------------- def update - - @language = Language.new + if params.has_key?(:language) unless permission_check("org.opensuse.yast.modules.yapi.language.write") render ErrorResult.error(403, 1, "no permission") and return end + @language = Language.new @language.language = params[:language][:current] @language.utf8 = params[:language][:utf8] @language.rootlocale = params[:language][:rootlocale] diff --git a/plugins/language/test/functional/language_controller_test.rb b/plugins/language/test/functional/language_controller_test.rb index 3804ff4..25a931a 100644 --- a/plugins/language/test/functional/language_controller_test.rb +++ b/plugins/language/test/functional/language_controller_test.rb @@ -11,28 +11,79 @@ class LanguageControllerTest < ActionController::TestCase @request = ActionController::TestRequest.new # http://railsforum.com/viewtopic.php?id=1719 @request.session[:account_id] = 1 # defined in fixtures - YastService.any_instance.stubs(:initialize) - YastService.any_instance.stubs(:execute).with(["YaPI::LANGUAGE::GetCurrentLanguage"]).returns("en_US") - end - -# TODO write tests -# def test_access_show -# get :show -# assert_response :success -# end -# -# def test_access_show_xml -# mime = Mime::XML -# @request.accept = mime.to_s -# get :show, :format => :xml -# assert_equal mime.to_s, @response.content_type -# end -# -# def test_access_show_json -# mime = Mime::JSON -# @request.accept = mime.to_s -# get :show, :format => :json -# assert_equal mime.to_s, @response.content_type -# end + end + + # TODO write tests + def test_access_show + #mock model to test only controller + Language.any_instance.stubs(:read) + get :show + assert_response :success + end + + def test_access_denied + #mock model to test only controller + Language.any_instance.stubs(:read) + @controller.stubs(:permission_check).returns(false); + get :show + assert_response :forbidden + end + + def test_access_show_xml + Language.any_instance.stubs(:read) + mime = Mime::XML + @request.accept = mime.to_s + get :show, :format => :xml + assert_equal mime.to_s, @response.content_type + end + + def test_access_show_json + Language.any_instance.stubs(:read) + mime = Mime::JSON + @request.accept = mime.to_s + get :show, :format => :json + assert_equal mime.to_s, @response.content_type + end + + Data = {:language => { + :current => "cs_CZ", + :utf8 => "true", + :rootlocale => "false" + }} + + def test_update + Language.any_instance.stubs(:save) + put :update, Data + check_update_result + end + + def test_create + Language.any_instance.stubs(:save) + put :create, Data + check_update_result + end + def check_update_result + assert_response :success + assert_equal @controller.language.language, Data[:language][:current] + assert_equal @controller.language.utf8, Data[:language][:utf8] + assert_equal @controller.language.rootlocale, Data[:language][:rootlocale] + end + + def test_update_noparams + Language.any_instance.stubs(:save) + put :update + assert_response :missing + end + + def test_update_noperm + #ensure that nothink is saved + Language.any_instance.expects(:save).never + + @controller.stubs(:permission_check).returns(false); + + put :update, Data + + assert_response :forbidden + end end diff --git a/plugins/language/test/unit/language_test.rb b/plugins/language/test/unit/language_test.rb index 7932320..861bd02 100644 --- a/plugins/language/test/unit/language_test.rb +++ b/plugins/language/test/unit/language_test.rb @@ -1,7 +1,15 @@ require 'test_helper' + + class LanguageTest < ActiveSupport::TestCase + Test_Lang = { + "test" => ["testing","la testing",".utf","la t"], + "a" => ["b","b","b","b"], + "c" => ["d","d","d","d"] + } + def read_arguments return { "current"=> "true", @@ -16,7 +24,7 @@ class LanguageTest < ActiveSupport::TestCase "current" => "en_US", "utf8" => "true", "rootlang" => "ctype", - "languages" => {"test" => "testing","a" => "b","c" => "d"} + "languages" => Test_Lang } end @@ -28,39 +36,67 @@ class LanguageTest < ActiveSupport::TestCase } end - def setup - - @language = Language.new - - - - + def setup + @language = Language.new end def test_getter YastService.stubs(:Call).with("YaPI::LANGUAGE::Read",read_arguments).returns(read_response) -# debugger @language.read assert_equal("en_US", @language.language) assert_equal("ctype", @language.rootlocale) assert_equal("true", @language.utf8) - languages = { - "test" => "testing", - "a" => "b", - "c" => "d" - } - assert_equal(languages,(a)language.available) + assert_equal(Test_Lang,(a)language.available) end def test_setter YastService.stubs(:Call).with("YaPI::LANGUAGE::Write",write_arguments).returns(true) + @language.language = "de_DE" @language.rootlocale = "false" @language.utf8 = "false" @language.save end + def test_xml + #inject Language to set available for direct testing + def @language.available=(val) + @@available=val + end + + @language.language = "de_DE" + @language.rootlocale = "false" + @language.utf8 = "false" + @language.available = Test_Lang + + response = Hash.from_xml((a)language.to_xml) + response = response["language"] + + assert_equal("de_DE", response["current"]) + assert_equal("false", response["utf8"]) + assert_equal("false", response["rootlocale"]) + lang_reponse = [ + {"id" => "test", "name" => "testing" }, + {"id" => "a", "name" => "b" }, + {"id" => "c", "name" => "d" } + ] + assert_equal(lang_reponse.sort { |a,b| a["id"] <=> b["id"] }, + response["available"].sort { |a,b| a["id"] <=> b["id"] }) + end + + def test_json + def @language.available=(val) + @@available=val + end + + @language.language = "de_DE" + @language.rootlocale = "false" + @language.utf8 = "false" + @language.available = Test_Lang + + assert_not_nil((a)language.to_json) + end end hooks/post-receive -- YaST web service -- 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] r57797 - in /branches/SuSE-SLE-10-SP3-Branch/autoinstallation: package/autoyast2.changes src/modules/AutoinstLVM.ycp
by ug＠svn.opensuse.org 30 Jun '09

30 Jun '09

Author: ug Date: Tue Jun 30 10:10:17 2009 New Revision: 57797 URL: http://svn.opensuse.org/viewcvs/yast?rev=57797&view=rev Log: LVM 'max' calculation is less strict (bnc#517052) Modified: branches/SuSE-SLE-10-SP3-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/autoinstallation/package/autoyast2.changes Tue Jun 30 10:10:17 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jun 30 10:07:18 CEST 2009 - ug(a)suse.de + +- LVM "max" calculation is less strict (bnc#517052) + +------------------------------------------------------------------- Mon Jun 29 13:37:18 CEST 2009 - ug(a)suse.de - <pxe> schema file added (bnc#516813) Modified: branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/autoinstallation/src/modules/AutoinstLVM.ycp Tue Jun 30 10:10:17 2009 @@ -483,6 +483,9 @@ lv["size_k"] = freeSpace; lv["size"] = sformat("%1K",freeSpace); } + y2milestone("size_k before rounding %1",lv["size_k"]:0); + lv["size_k"] = (integer)( (lv["size_k"]:0*1024) / pesize ) * pesize / 1024; // rounding + y2milestone("size_k after rounding %1",lv["size_k"]:0); list<map> lvlist = ExistingLVM[device, "partitions"]:[]; -- 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 : branch, master, updated.
by git version control 30 Jun '09

30 Jun '09

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "YaST web service". The branch, master has been updated via e314f09ab1b3dde10d0b434ccf5312e53199ffe1 (commit) from f640778fa2fe10fc457e62f3deab2a0a2fa99322 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e314f09ab1b3dde10d0b434ccf5312e53199ffe1 Author: Stefan Schubert <schubi(a)suse.de> Date: Tue Jun 30 10:02:34 2009 +0200 added rubygem-mocha ----------------------------------------------------------------------- Summary of changes and diff: dist/yast2-webservice.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dist/yast2-webservice.spec b/dist/yast2-webservice.spec index 0f582b1..c203f94 100644 --- a/dist/yast2-webservice.spec +++ b/dist/yast2-webservice.spec @@ -30,7 +30,7 @@ Source7: lighttpd.conf Source8: modules.conf Source9: yastws BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ruby-devel, pkg-config, rubygem-relevance-rcov +BuildRequires: ruby-devel, pkg-config, rubygem-relevance-rcov, rubygem-mocha BuildArch: noarch # hooks/post-receive -- YaST web service -- 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] r57796 - /tags/branch-SLE-10-SP3-2_13_161/bootloader/
by juhliarik＠svn.opensuse.org 29 Jun '09

29 Jun '09

Author: juhliarik Date: Mon Jun 29 16:57:22 2009 New Revision: 57796 URL: http://svn.opensuse.org/viewcvs/yast?rev=57796&view=rev Log: Created tag branch-SLE-10-SP3-2_13_161 for bootloader Added: tags/branch-SLE-10-SP3-2_13_161/bootloader/ - copied from r57795, branches/SuSE-SLE-10-SP3-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0