August 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] Build failed in Hudson: webyast-service-11.1-i586 #253
by Hudson Integration Service 31 Aug '09

31 Aug '09

See http://yast.suse.de:3334/job/webyast-service-11.1-i586/253/changes Changes: [root] status module: added new xml format ------------------------------------------ [...truncated 500 lines...] Started .......... Finished in 1.022822 seconds. 10 tests, 15 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" Loaded suite /usr/bin/rake Started Finished in 7.8e-05 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/language_test.rb" (in /src/rest-service/plugins/language) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started .... Finished in 0.53585 seconds. 4 tests, 9 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/language_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ....... Finished in 0.815831 seconds. 7 tests, 16 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" Loaded suite /usr/bin/rake Started Finished in 7.9e-05 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/services_test.rb" (in /src/rest-service/plugins/services) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ............ Finished in 0.887848 seconds. 12 tests, 12 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/services_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ... Finished in 0.778473 seconds. 3 tests, 3 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" Loaded suite /usr/bin/rake Started Finished in 6.1e-05 seconds. 0 tests, 0 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/unit/status_test.rb" (in /src/rest-service/plugins/status) Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started ..F.. Finished in 2.061122 seconds. 1) Failure: test_fetch_data(StatusTest) [/test/unit/status_test.rb:115]: <{"tx"=> {"T_1248092930"=>"2.8285714286e+00", "T_1248093000"=>"1.5542857143e+01", "T_1248092370"=>"2.1435714286e+01", "T_1248092580"=>"4.3878571429e+01", "T_1248092790"=>"4.0714285714e+00", "T_1248093070"=>"2.7071428571e+00", "T_1248092440"=>"4.0992857143e+01", "T_1248092650"=>"9.7942857143e+01", "T_1248092860"=>"2.4142857143e+00", "T_1248092300"=>"4.0500000000e+00", "T_1248092510"=>"3.4264285714e+01", "T_1248092720"=>"2.9928571429e+00"}, "rx"=> {"T_1248092930"=>"2.5092857143e+01", "T_1248093000"=>"3.1314285714e+01", "T_1248092370"=>"4.7314285714e+01", "T_1248092580"=>"7.7485714286e+01", "T_1248092790"=>"2.2585714286e+01", "T_1248093070"=>"2.3064285714e+01", "T_1248092440"=>"5.7578571429e+01", "T_1248092650"=>"1.1698571429e+02", "T_1248092860"=>"2.4292857143e+01", "T_1248092300"=>"2.4628571429e+01", "T_1248092510"=>"4.9271428571e+01", "T_1248092720"=>"2.3042857143e+01"}}> expected but was <{"tx"=> {"1248092580"=>"4.3878571429e+01", "1248092790"=>"4.0714285714e+00", "1248092440"=>"4.0992857143e+01", "1248093000"=>"1.5542857143e+01", "1248092650"=>"9.7942857143e+01", "1248092860"=>"2.4142857143e+00", "1248092300"=>"4.0500000000e+00", "1248092510"=>"3.4264285714e+01", "1248093070"=>"2.7071428571e+00", "1248092720"=>"2.9928571429e+00", "1248092930"=>"2.8285714286e+00", "1248092370"=>"2.1435714286e+01"}, "rx"=> {"1248092580"=>"7.7485714286e+01", "1248093140"=>"invalid", "1248092790"=>"2.2585714286e+01", "1248092230"=>"invalid", "1248092440"=>"5.7578571429e+01", "1248093000"=>"3.1314285714e+01", "1248092650"=>"1.1698571429e+02", "1248092860"=>"2.4292857143e+01", "1248092090"=>"invalid", "1248092300"=>"2.4628571429e+01", "1248092510"=>"4.9271428571e+01", "1248093070"=>"2.3064285714e+01", "1248092720"=>"2.3042857143e+01", "1248092930"=>"2.5092857143e+01", "1248092160"=>"invalid", "1248092370"=>"4.7314285714e+01"}, "starttime"=>"1248092090"}>. diff: {"tx"=> - {"T_1248092930"=>"2.8285714286e+00", - "T_1248093000"=>"1.5542857143e+01", - "T_1248092370"=>"2.1435714286e+01", - "T_1248092580"=>"4.3878571429e+01", ? ^ -- + {"1248092580"=>"4.3878571429e+01", ? ^ - "T_1248092790"=>"4.0714285714e+00", ? -- + "1248092790"=>"4.0714285714e+00", - "T_1248093070"=>"2.7071428571e+00", - "T_1248092440"=>"4.0992857143e+01", ? -- + "1248092440"=>"4.0992857143e+01", + "1248093000"=>"1.5542857143e+01", - "T_1248092650"=>"9.7942857143e+01", ? -- + "1248092650"=>"9.7942857143e+01", - "T_1248092860"=>"2.4142857143e+00", ? -- + "1248092860"=>"2.4142857143e+00", - "T_1248092300"=>"4.0500000000e+00", ? -- + "1248092300"=>"4.0500000000e+00", - "T_1248092510"=>"3.4264285714e+01", ? -- + "1248092510"=>"3.4264285714e+01", + "1248093070"=>"2.7071428571e+00", - "T_1248092720"=>"2.9928571429e+00"}, ? -- - + "1248092720"=>"2.9928571429e+00", + "1248092930"=>"2.8285714286e+00", + "1248092370"=>"2.1435714286e+01"}, "rx"=> - {"T_1248092930"=>"2.5092857143e+01", - "T_1248093000"=>"3.1314285714e+01", - "T_1248092370"=>"4.7314285714e+01", - "T_1248092580"=>"7.7485714286e+01", ? ^ -- + {"1248092580"=>"7.7485714286e+01", ? ^ + "1248093140"=>"invalid", - "T_1248092790"=>"2.2585714286e+01", ? -- + "1248092790"=>"2.2585714286e+01", - "T_1248093070"=>"2.3064285714e+01", + "1248092230"=>"invalid", - "T_1248092440"=>"5.7578571429e+01", ? -- + "1248092440"=>"5.7578571429e+01", + "1248093000"=>"3.1314285714e+01", - "T_1248092650"=>"1.1698571429e+02", ? -- + "1248092650"=>"1.1698571429e+02", - "T_1248092860"=>"2.4292857143e+01", ? -- + "1248092860"=>"2.4292857143e+01", + "1248092090"=>"invalid", - "T_1248092300"=>"2.4628571429e+01", ? -- + "1248092300"=>"2.4628571429e+01", - "T_1248092510"=>"4.9271428571e+01", ? -- + "1248092510"=>"4.9271428571e+01", + "1248093070"=>"2.3064285714e+01", - "T_1248092720"=>"2.3042857143e+01"}} ? -- ^^ + "1248092720"=>"2.3042857143e+01", ? ^ + "1248092930"=>"2.5092857143e+01", + "1248092160"=>"invalid", + "1248092370"=>"4.7314285714e+01"}, + "starttime"=>"1248092090"} 5 tests, 5 assertions, 1 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" "test/functional/status_controller_test.rb" Loaded suite /usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader Started {} F.{} ... Finished in 0.773876 seconds. 1) Failure: test_access_denied(StatusControllerTest) [test/plugin_basic_tests.rb:51]: Expected response to be a <:forbidden>, but was <200> 5 tests, 2 assertions, 1 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications /usr/bin/ruby -I"lib:test" "/usr/lib/ruby/gems/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb" Errors running test:units and test:functionals! rake aborted! Error on execute task test on plugins/status /src/rest-service/Rakefile:27 (See full trace by running task with --trace) ERROR: detected exit code 1 ( ) ( ) ( ) _ ) ( \_ _(_\ \)__ (____\___)) build failed stopping dbus.. Shutting down D-Bus daemon..done ... unmounting proc ... unmounting pts Archiving artifacts Build wasn't successful, skipping saikuro coverage report Publishing rails stats report... [workspace] $ rake --silent stats Failed to send e-mail to root because no e-mail address is known, and no default e-mail domain is configured -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 1

[yast-commit] <web-client> master : test partial result, remove trailing CR char
by Ladislav Slezak 31 Aug '09

31 Aug '09

ref: refs/heads/master commit 83e1d5f0ff3c47bd9c9b5e39eb6b5ffdf3391594 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Mon Aug 31 09:56:20 2009 +0200 test partial result, remove trailing CR char --- plugins/services/app/views/services/_status.rhtml | 2 +- .../test/functional/services_controller_test.rb | 30 ++++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/plugins/services/app/views/services/_status.rhtml b/plugins/services/app/views/services/_status.rhtml index e8e5569..874c4e1 100644 --- a/plugins/services/app/views/services/_status.rhtml +++ b/plugins/services/app/views/services/_status.rhtml @@ -21,4 +21,4 @@ case status else _("(unknown: #{status})") end -%> +-%> diff --git a/plugins/services/test/functional/services_controller_test.rb b/plugins/services/test/functional/services_controller_test.rb index a43049e..07870ca 100644 --- a/plugins/services/test/functional/services_controller_test.rb +++ b/plugins/services/test/functional/services_controller_test.rb @@ -2,31 +2,55 @@ require 'test_helper' class ServicesControllerTest < ActionController::TestCase - class Proxy attr_accessor :result, :permissions, :timeout - def find + def find(params = {}) return result end end + class Result + attr_accessor :status + + def fill + @status = 0 + end + + def save + return true + end + end + def setup + @result = Result.new + @result.fill + ServicesController.any_instance.stubs(:login_required) @controller = ServicesController.new + @request = ActionController::TestRequest.new # http://railsforum.com/viewtopic.php?id=1719 @request.session[:account_id] = 1 # defined in fixtures + @permissions = { :read => true, :execute => true } @proxy = Proxy.new @proxy.permissions = @permissions @proxy.result = @result + + YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.services').returns(@proxy) end def test_should_get_index - YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.services').returns(@proxy) get :index assert_response :success assert_not_nil assigns(:services) end + + def test_ntp_status + ret = get :show_status, {:id => 'ntp'} + assert_response :success + assert ret.body == '(running)' + 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> network : test partial result, remove trailing CR char
by Ladislav Slezak 31 Aug '09

31 Aug '09

ref: refs/heads/network commit 83e1d5f0ff3c47bd9c9b5e39eb6b5ffdf3391594 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Mon Aug 31 09:56:20 2009 +0200 test partial result, remove trailing CR char --- plugins/services/app/views/services/_status.rhtml | 2 +- .../test/functional/services_controller_test.rb | 30 ++++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/plugins/services/app/views/services/_status.rhtml b/plugins/services/app/views/services/_status.rhtml index e8e5569..874c4e1 100644 --- a/plugins/services/app/views/services/_status.rhtml +++ b/plugins/services/app/views/services/_status.rhtml @@ -21,4 +21,4 @@ case status else _("(unknown: #{status})") end -%> +-%> diff --git a/plugins/services/test/functional/services_controller_test.rb b/plugins/services/test/functional/services_controller_test.rb index a43049e..07870ca 100644 --- a/plugins/services/test/functional/services_controller_test.rb +++ b/plugins/services/test/functional/services_controller_test.rb @@ -2,31 +2,55 @@ require 'test_helper' class ServicesControllerTest < ActionController::TestCase - class Proxy attr_accessor :result, :permissions, :timeout - def find + def find(params = {}) return result end end + class Result + attr_accessor :status + + def fill + @status = 0 + end + + def save + return true + end + end + def setup + @result = Result.new + @result.fill + ServicesController.any_instance.stubs(:login_required) @controller = ServicesController.new + @request = ActionController::TestRequest.new # http://railsforum.com/viewtopic.php?id=1719 @request.session[:account_id] = 1 # defined in fixtures + @permissions = { :read => true, :execute => true } @proxy = Proxy.new @proxy.permissions = @permissions @proxy.result = @result + + YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.services').returns(@proxy) end def test_should_get_index - YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.services').returns(@proxy) get :index assert_response :success assert_not_nil assigns(:services) end + + def test_ntp_status + ret = get :show_status, {:id => 'ntp'} + assert_response :success + assert ret.body == '(running)' + 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> basesystem : test partial result, remove trailing CR char
by Ladislav Slezak 31 Aug '09

31 Aug '09

ref: refs/heads/basesystem commit 83e1d5f0ff3c47bd9c9b5e39eb6b5ffdf3391594 Author: Ladislav Slezak <lslezak(a)novell.com> Date: Mon Aug 31 09:56:20 2009 +0200 test partial result, remove trailing CR char --- plugins/services/app/views/services/_status.rhtml | 2 +- .../test/functional/services_controller_test.rb | 30 ++++++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/plugins/services/app/views/services/_status.rhtml b/plugins/services/app/views/services/_status.rhtml index e8e5569..874c4e1 100644 --- a/plugins/services/app/views/services/_status.rhtml +++ b/plugins/services/app/views/services/_status.rhtml @@ -21,4 +21,4 @@ case status else _("(unknown: #{status})") end -%> +-%> diff --git a/plugins/services/test/functional/services_controller_test.rb b/plugins/services/test/functional/services_controller_test.rb index a43049e..07870ca 100644 --- a/plugins/services/test/functional/services_controller_test.rb +++ b/plugins/services/test/functional/services_controller_test.rb @@ -2,31 +2,55 @@ require 'test_helper' class ServicesControllerTest < ActionController::TestCase - class Proxy attr_accessor :result, :permissions, :timeout - def find + def find(params = {}) return result end end + class Result + attr_accessor :status + + def fill + @status = 0 + end + + def save + return true + end + end + def setup + @result = Result.new + @result.fill + ServicesController.any_instance.stubs(:login_required) @controller = ServicesController.new + @request = ActionController::TestRequest.new # http://railsforum.com/viewtopic.php?id=1719 @request.session[:account_id] = 1 # defined in fixtures + @permissions = { :read => true, :execute => true } @proxy = Proxy.new @proxy.permissions = @permissions @proxy.result = @result + + YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.services').returns(@proxy) end def test_should_get_index - YaST::ServiceResource.stubs(:proxy_for).with('org.opensuse.yast.modules.yapi.services').returns(@proxy) get :index assert_response :success assert_not_nil assigns(:services) end + + def test_ntp_status + ret = get :show_status, {:id => 'ntp'} + assert_response :success + assert ret.body == '(running)' + 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] <rest-service> master : test read_status method, fixed mocked values
by Ladislav Slezak 31 Aug '09

31 Aug '09

ref: refs/heads/master commit e05491b8072d8df298a047efb116640842e3399b Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Aug 28 12:38:40 2009 +0200 test read_status method, fixed mocked values --- plugins/services/test/unit/services_test.rb | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/services/test/unit/services_test.rb b/plugins/services/test/unit/services_test.rb index 29c6915..e959eeb 100644 --- a/plugins/services/test/unit/services_test.rb +++ b/plugins/services/test/unit/services_test.rb @@ -94,12 +94,14 @@ class ServiceTest < ActiveSupport::TestCase end test "check LSB service status" do - ret = {:exit => 0} + ret = {'exit' => '0'} YastService.stubs(:Call).with('YaPI::SERVICES::Execute', 'ntp', 'status').returns(ret) YaST::ConfigFile.stubs(:config_default_location).returns(vendor_config('missing')) s = Service.new('ntp') assert s.save('status') == ret + s.read_status + assert s.status == '0' end @@ -109,11 +111,13 @@ class ServiceTest < ActiveSupport::TestCase # do not call introspection in the Scr constructor DBus::SystemBus.instance.stubs(:introspect).returns('<node><interface name="org.opensuse.yast.SCR.Methods"></interface></node>') - ret = {:exit => 0, :stderr => "", :stdout => "Checking for service collectd ..running\n"} + ret = {'exit' => '0', 'stderr' => '', 'stdout' => "Checking for service collectd ..running\n"} Scr.instance.stubs(:execute).with(['/usr/sbin/rccollectd status']).returns(ret) s = Service.new('vendor_service') assert s.save("status") == ret + s.read_status + assert s.status == '0' 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] <rest-service> network : test read_status method, fixed mocked values
by Ladislav Slezak 31 Aug '09

31 Aug '09

ref: refs/heads/network commit e05491b8072d8df298a047efb116640842e3399b Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Aug 28 12:38:40 2009 +0200 test read_status method, fixed mocked values --- plugins/services/test/unit/services_test.rb | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/services/test/unit/services_test.rb b/plugins/services/test/unit/services_test.rb index 29c6915..e959eeb 100644 --- a/plugins/services/test/unit/services_test.rb +++ b/plugins/services/test/unit/services_test.rb @@ -94,12 +94,14 @@ class ServiceTest < ActiveSupport::TestCase end test "check LSB service status" do - ret = {:exit => 0} + ret = {'exit' => '0'} YastService.stubs(:Call).with('YaPI::SERVICES::Execute', 'ntp', 'status').returns(ret) YaST::ConfigFile.stubs(:config_default_location).returns(vendor_config('missing')) s = Service.new('ntp') assert s.save('status') == ret + s.read_status + assert s.status == '0' end @@ -109,11 +111,13 @@ class ServiceTest < ActiveSupport::TestCase # do not call introspection in the Scr constructor DBus::SystemBus.instance.stubs(:introspect).returns('<node><interface name="org.opensuse.yast.SCR.Methods"></interface></node>') - ret = {:exit => 0, :stderr => "", :stdout => "Checking for service collectd ..running\n"} + ret = {'exit' => '0', 'stderr' => '', 'stdout' => "Checking for service collectd ..running\n"} Scr.instance.stubs(:execute).with(['/usr/sbin/rccollectd status']).returns(ret) s = Service.new('vendor_service') assert s.save("status") == ret + s.read_status + assert s.status == '0' 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] <rest-service> basesystem : test read_status method, fixed mocked values
by Ladislav Slezak 31 Aug '09

31 Aug '09

ref: refs/heads/basesystem commit e05491b8072d8df298a047efb116640842e3399b Author: Ladislav Slezak <lslezak(a)novell.com> Date: Fri Aug 28 12:38:40 2009 +0200 test read_status method, fixed mocked values --- plugins/services/test/unit/services_test.rb | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/services/test/unit/services_test.rb b/plugins/services/test/unit/services_test.rb index 29c6915..e959eeb 100644 --- a/plugins/services/test/unit/services_test.rb +++ b/plugins/services/test/unit/services_test.rb @@ -94,12 +94,14 @@ class ServiceTest < ActiveSupport::TestCase end test "check LSB service status" do - ret = {:exit => 0} + ret = {'exit' => '0'} YastService.stubs(:Call).with('YaPI::SERVICES::Execute', 'ntp', 'status').returns(ret) YaST::ConfigFile.stubs(:config_default_location).returns(vendor_config('missing')) s = Service.new('ntp') assert s.save('status') == ret + s.read_status + assert s.status == '0' end @@ -109,11 +111,13 @@ class ServiceTest < ActiveSupport::TestCase # do not call introspection in the Scr constructor DBus::SystemBus.instance.stubs(:introspect).returns('<node><interface name="org.opensuse.yast.SCR.Methods"></interface></node>') - ret = {:exit => 0, :stderr => "", :stdout => "Checking for service collectd ..running\n"} + ret = {'exit' => '0', 'stderr' => '', 'stdout' => "Checking for service collectd ..running\n"} Scr.instance.stubs(:execute).with(['/usr/sbin/rccollectd status']).returns(ret) s = Service.new('vendor_service') assert s.save("status") == ret + s.read_status + assert s.status == '0' 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] <rest-service> network : implemented routes - default only (previous commit was incomplete)
by Michal Zugec 31 Aug '09

31 Aug '09

ref: refs/heads/network commit 2434c6fb420074c8655aea500069ad356b1ab918 Author: Michal Zugec <mzugec(a)suse.cz> Date: Mon Aug 31 09:54:36 2009 +0200 implemented routes - default only (previous commit was incomplete) --- .../network/app/controllers/routes_controller.rb | 12 ++++---- plugins/network/app/models/route.rb | 26 ++++++++++--------- plugins/network/config/resources/routes.yml | 1 - plugins/network/test/unit/route_test.rb | 25 +++++++++++++++++++ plugins/network/test/unit/routes_test.rb | 25 ------------------- 5 files changed, 45 insertions(+), 44 deletions(-) diff --git a/plugins/network/app/controllers/routes_controller.rb b/plugins/network/app/controllers/routes_controller.rb index 2c91e6f..dea97a8 100644 --- a/plugins/network/app/controllers/routes_controller.rb +++ b/plugins/network/app/controllers/routes_controller.rb @@ -11,12 +11,12 @@ class RoutesController < ApplicationController render ErrorResult.error(403, 1, "no permission") and return end - root = params[:routing] + root = params[:routes] if root == nil render ErrorResult.error(404, 2, "format or internal error") and return end - @routing = Routing.new(root) + @routing = Route.new(root) @routing.save render :show end @@ -33,12 +33,12 @@ class RoutesController < ApplicationController render ErrorResult.error( 403, 1, "no permission" ) and return end - @routes = Routes.find + @route = Route.find(params[:id]) respond_to do |format| - format.html { render :xml => @routes.to_xml( :root => "routes", :dasherize => false ) } - format.xml { render :xml => @routes.to_xml( :root => "routes", :dasherize => false ) } - format.json { render :json => @routes.to_json } + format.html { render :xml => @route.to_xml( :root => "route", :dasherize => false ) } + format.xml { render :xml => @route.to_xml( :root => "route", :dasherize => false ) } + format.json { render :json => @route.to_json } end end diff --git a/plugins/network/app/models/route.rb b/plugins/network/app/models/route.rb index 388417d..b3c34ac 100644 --- a/plugins/network/app/models/route.rb +++ b/plugins/network/app/models/route.rb @@ -2,25 +2,27 @@ # Provides set and gets resources from YaPI network module. # Main goal is handle YaPI specific calls and data formats. Provides cleaned # and well defined data. -class Routes +class Route - # default route - attr_accessor :default + # default gateway + attr_accessor :via, + :id private public def initialize(kwargs) - @default = kwargs["default"] + @via = kwargs["via"] end # fills route instance with data from YaPI. # - # +warn+: Doesn't take any parameters. - def Routes.find - response = YastService.Call("YaPI::NETWORK::Read") # hostname: true - ret = Routes.new(response["routes"]) + # +warn+: YaPI implements default only. + def Route.find( which ) + response = YastService.Call("YaPI::NETWORK::Read") + ret = Route.new(response["routes"][which]) + ret.id = which return ret end @@ -28,9 +30,9 @@ class Routes # so it support partial safe (e.g. save only new timezone if rest of fields is not set). def save settings = { - "default" => @default, + @id => { 'via'=>@via }, } - YastService.Call("YaPI::NETWORK::Write",{"routes" => settings}) + YastService.Call("YaPI::NETWORK::Write",{"route" => settings}) # TODO success or not? end @@ -38,8 +40,8 @@ class Routes xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] - xml.hostname do - xml.default @default + xml.route do + xml.via @via end end diff --git a/plugins/network/config/resources/routes.yml b/plugins/network/config/resources/routes.yml index 3f765a5..09c08d5 100644 --- a/plugins/network/config/resources/routes.yml +++ b/plugins/network/config/resources/routes.yml @@ -1,4 +1,3 @@ interface: org.opensuse.yast.modules.yapi.network.routes policy: org.opensuse.yast.modules.yapi.network controller: network/routes -singular: true diff --git a/plugins/network/test/unit/route_test.rb b/plugins/network/test/unit/route_test.rb new file mode 100644 index 0000000..c5bbd4a --- /dev/null +++ b/plugins/network/test/unit/route_test.rb @@ -0,0 +1,25 @@ +require File.expand_path(File.dirname(__FILE__) + "/../test_helper") + +class RouteTest < ActiveSupport::TestCase + + RESPONSE_FULL = { + 'interfaces'=>{ + 'eth0'=>{'bootproto'=>'dhcp'}, + 'eth1'=>{'bootproto'=>'static', 'ipaddr'=>'192.168.3.27/24'}}, + 'routes'=>{'default'=>{'via'=>'10.20.7.254'}}, + 'dns'=>{'dnsservers'=>'10.20.0.15 10.20.0.8', 'dnsdomains'=>'suse.cz suse.de'}, + 'hostname'=>{'name'=>'linux', 'domain'=>'suse.cz'} + } + + def setup + YastService.stubs(:Call).with("YaPI::NETWORK::Read").returns(RESPONSE_FULL) + end + + def test_getter + route=Route.find('default') +# assert_equal("linux", hostname.name) +# assert_equal("suse.cz", hostname.domain) + end + +end + diff --git a/plugins/network/test/unit/routes_test.rb b/plugins/network/test/unit/routes_test.rb deleted file mode 100644 index 4b815aa..0000000 --- a/plugins/network/test/unit/routes_test.rb +++ /dev/null @@ -1,25 +0,0 @@ -require File.expand_path(File.dirname(__FILE__) + "/../test_helper") - -class RoutesTest < ActiveSupport::TestCase - - RESPONSE_FULL = { - 'interfaces'=>{ - 'eth0'=>{'bootproto'=>'dhcp'}, - 'eth1'=>{'bootproto'=>'static', 'ipaddr'=>'192.168.3.27/24'}}, - 'routes'=>{'default'=>'10.20.7.254'}, - 'dns'=>{'dnsservers'=>'10.20.0.15 10.20.0.8', 'dnsdomains'=>'suse.cz suse.de'}, - 'hostname'=>{'name'=>'linux', 'domain'=>'suse.cz'} - } - - def setup - YastService.stubs(:Call).with("YaPI::NETWORK::Read").returns(RESPONSE_FULL) - end - - def test_getter - hostname=Routes.find -# assert_equal("linux", hostname.name) -# assert_equal("suse.cz", hostname.domain) - 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] <rest-service> master : implemented routes - default only (previous commit was incomplete)
by Michal Zugec 31 Aug '09

31 Aug '09

ref: refs/heads/master commit 2434c6fb420074c8655aea500069ad356b1ab918 Author: Michal Zugec <mzugec(a)suse.cz> Date: Mon Aug 31 09:54:36 2009 +0200 implemented routes - default only (previous commit was incomplete) --- .../network/app/controllers/routes_controller.rb | 12 ++++---- plugins/network/app/models/route.rb | 26 ++++++++++--------- plugins/network/config/resources/routes.yml | 1 - plugins/network/test/unit/route_test.rb | 25 +++++++++++++++++++ plugins/network/test/unit/routes_test.rb | 25 ------------------- 5 files changed, 45 insertions(+), 44 deletions(-) diff --git a/plugins/network/app/controllers/routes_controller.rb b/plugins/network/app/controllers/routes_controller.rb index 2c91e6f..dea97a8 100644 --- a/plugins/network/app/controllers/routes_controller.rb +++ b/plugins/network/app/controllers/routes_controller.rb @@ -11,12 +11,12 @@ class RoutesController < ApplicationController render ErrorResult.error(403, 1, "no permission") and return end - root = params[:routing] + root = params[:routes] if root == nil render ErrorResult.error(404, 2, "format or internal error") and return end - @routing = Routing.new(root) + @routing = Route.new(root) @routing.save render :show end @@ -33,12 +33,12 @@ class RoutesController < ApplicationController render ErrorResult.error( 403, 1, "no permission" ) and return end - @routes = Routes.find + @route = Route.find(params[:id]) respond_to do |format| - format.html { render :xml => @routes.to_xml( :root => "routes", :dasherize => false ) } - format.xml { render :xml => @routes.to_xml( :root => "routes", :dasherize => false ) } - format.json { render :json => @routes.to_json } + format.html { render :xml => @route.to_xml( :root => "route", :dasherize => false ) } + format.xml { render :xml => @route.to_xml( :root => "route", :dasherize => false ) } + format.json { render :json => @route.to_json } end end diff --git a/plugins/network/app/models/route.rb b/plugins/network/app/models/route.rb index 388417d..b3c34ac 100644 --- a/plugins/network/app/models/route.rb +++ b/plugins/network/app/models/route.rb @@ -2,25 +2,27 @@ # Provides set and gets resources from YaPI network module. # Main goal is handle YaPI specific calls and data formats. Provides cleaned # and well defined data. -class Routes +class Route - # default route - attr_accessor :default + # default gateway + attr_accessor :via, + :id private public def initialize(kwargs) - @default = kwargs["default"] + @via = kwargs["via"] end # fills route instance with data from YaPI. # - # +warn+: Doesn't take any parameters. - def Routes.find - response = YastService.Call("YaPI::NETWORK::Read") # hostname: true - ret = Routes.new(response["routes"]) + # +warn+: YaPI implements default only. + def Route.find( which ) + response = YastService.Call("YaPI::NETWORK::Read") + ret = Route.new(response["routes"][which]) + ret.id = which return ret end @@ -28,9 +30,9 @@ class Routes # so it support partial safe (e.g. save only new timezone if rest of fields is not set). def save settings = { - "default" => @default, + @id => { 'via'=>@via }, } - YastService.Call("YaPI::NETWORK::Write",{"routes" => settings}) + YastService.Call("YaPI::NETWORK::Write",{"route" => settings}) # TODO success or not? end @@ -38,8 +40,8 @@ class Routes xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] - xml.hostname do - xml.default @default + xml.route do + xml.via @via end end diff --git a/plugins/network/config/resources/routes.yml b/plugins/network/config/resources/routes.yml index 3f765a5..09c08d5 100644 --- a/plugins/network/config/resources/routes.yml +++ b/plugins/network/config/resources/routes.yml @@ -1,4 +1,3 @@ interface: org.opensuse.yast.modules.yapi.network.routes policy: org.opensuse.yast.modules.yapi.network controller: network/routes -singular: true diff --git a/plugins/network/test/unit/route_test.rb b/plugins/network/test/unit/route_test.rb new file mode 100644 index 0000000..c5bbd4a --- /dev/null +++ b/plugins/network/test/unit/route_test.rb @@ -0,0 +1,25 @@ +require File.expand_path(File.dirname(__FILE__) + "/../test_helper") + +class RouteTest < ActiveSupport::TestCase + + RESPONSE_FULL = { + 'interfaces'=>{ + 'eth0'=>{'bootproto'=>'dhcp'}, + 'eth1'=>{'bootproto'=>'static', 'ipaddr'=>'192.168.3.27/24'}}, + 'routes'=>{'default'=>{'via'=>'10.20.7.254'}}, + 'dns'=>{'dnsservers'=>'10.20.0.15 10.20.0.8', 'dnsdomains'=>'suse.cz suse.de'}, + 'hostname'=>{'name'=>'linux', 'domain'=>'suse.cz'} + } + + def setup + YastService.stubs(:Call).with("YaPI::NETWORK::Read").returns(RESPONSE_FULL) + end + + def test_getter + route=Route.find('default') +# assert_equal("linux", hostname.name) +# assert_equal("suse.cz", hostname.domain) + end + +end + diff --git a/plugins/network/test/unit/routes_test.rb b/plugins/network/test/unit/routes_test.rb deleted file mode 100644 index 4b815aa..0000000 --- a/plugins/network/test/unit/routes_test.rb +++ /dev/null @@ -1,25 +0,0 @@ -require File.expand_path(File.dirname(__FILE__) + "/../test_helper") - -class RoutesTest < ActiveSupport::TestCase - - RESPONSE_FULL = { - 'interfaces'=>{ - 'eth0'=>{'bootproto'=>'dhcp'}, - 'eth1'=>{'bootproto'=>'static', 'ipaddr'=>'192.168.3.27/24'}}, - 'routes'=>{'default'=>'10.20.7.254'}, - 'dns'=>{'dnsservers'=>'10.20.0.15 10.20.0.8', 'dnsdomains'=>'suse.cz suse.de'}, - 'hostname'=>{'name'=>'linux', 'domain'=>'suse.cz'} - } - - def setup - YastService.stubs(:Call).with("YaPI::NETWORK::Read").returns(RESPONSE_FULL) - end - - def test_getter - hostname=Routes.find -# assert_equal("linux", hostname.name) -# assert_equal("suse.cz", hostname.domain) - 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] <rest-service> dmacvicar_log_viewer : implemented routes - default only (previous commit was incomplete)
by Michal Zugec 31 Aug '09

31 Aug '09

ref: refs/heads/dmacvicar_log_viewer commit 2434c6fb420074c8655aea500069ad356b1ab918 Author: Michal Zugec <mzugec(a)suse.cz> Date: Mon Aug 31 09:54:36 2009 +0200 implemented routes - default only (previous commit was incomplete) --- .../network/app/controllers/routes_controller.rb | 12 ++++---- plugins/network/app/models/route.rb | 26 ++++++++++--------- plugins/network/config/resources/routes.yml | 1 - plugins/network/test/unit/route_test.rb | 25 +++++++++++++++++++ plugins/network/test/unit/routes_test.rb | 25 ------------------- 5 files changed, 45 insertions(+), 44 deletions(-) diff --git a/plugins/network/app/controllers/routes_controller.rb b/plugins/network/app/controllers/routes_controller.rb index 2c91e6f..dea97a8 100644 --- a/plugins/network/app/controllers/routes_controller.rb +++ b/plugins/network/app/controllers/routes_controller.rb @@ -11,12 +11,12 @@ class RoutesController < ApplicationController render ErrorResult.error(403, 1, "no permission") and return end - root = params[:routing] + root = params[:routes] if root == nil render ErrorResult.error(404, 2, "format or internal error") and return end - @routing = Routing.new(root) + @routing = Route.new(root) @routing.save render :show end @@ -33,12 +33,12 @@ class RoutesController < ApplicationController render ErrorResult.error( 403, 1, "no permission" ) and return end - @routes = Routes.find + @route = Route.find(params[:id]) respond_to do |format| - format.html { render :xml => @routes.to_xml( :root => "routes", :dasherize => false ) } - format.xml { render :xml => @routes.to_xml( :root => "routes", :dasherize => false ) } - format.json { render :json => @routes.to_json } + format.html { render :xml => @route.to_xml( :root => "route", :dasherize => false ) } + format.xml { render :xml => @route.to_xml( :root => "route", :dasherize => false ) } + format.json { render :json => @route.to_json } end end diff --git a/plugins/network/app/models/route.rb b/plugins/network/app/models/route.rb index 388417d..b3c34ac 100644 --- a/plugins/network/app/models/route.rb +++ b/plugins/network/app/models/route.rb @@ -2,25 +2,27 @@ # Provides set and gets resources from YaPI network module. # Main goal is handle YaPI specific calls and data formats. Provides cleaned # and well defined data. -class Routes +class Route - # default route - attr_accessor :default + # default gateway + attr_accessor :via, + :id private public def initialize(kwargs) - @default = kwargs["default"] + @via = kwargs["via"] end # fills route instance with data from YaPI. # - # +warn+: Doesn't take any parameters. - def Routes.find - response = YastService.Call("YaPI::NETWORK::Read") # hostname: true - ret = Routes.new(response["routes"]) + # +warn+: YaPI implements default only. + def Route.find( which ) + response = YastService.Call("YaPI::NETWORK::Read") + ret = Route.new(response["routes"][which]) + ret.id = which return ret end @@ -28,9 +30,9 @@ class Routes # so it support partial safe (e.g. save only new timezone if rest of fields is not set). def save settings = { - "default" => @default, + @id => { 'via'=>@via }, } - YastService.Call("YaPI::NETWORK::Write",{"routes" => settings}) + YastService.Call("YaPI::NETWORK::Write",{"route" => settings}) # TODO success or not? end @@ -38,8 +40,8 @@ class Routes xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] - xml.hostname do - xml.default @default + xml.route do + xml.via @via end end diff --git a/plugins/network/config/resources/routes.yml b/plugins/network/config/resources/routes.yml index 3f765a5..09c08d5 100644 --- a/plugins/network/config/resources/routes.yml +++ b/plugins/network/config/resources/routes.yml @@ -1,4 +1,3 @@ interface: org.opensuse.yast.modules.yapi.network.routes policy: org.opensuse.yast.modules.yapi.network controller: network/routes -singular: true diff --git a/plugins/network/test/unit/route_test.rb b/plugins/network/test/unit/route_test.rb new file mode 100644 index 0000000..c5bbd4a --- /dev/null +++ b/plugins/network/test/unit/route_test.rb @@ -0,0 +1,25 @@ +require File.expand_path(File.dirname(__FILE__) + "/../test_helper") + +class RouteTest < ActiveSupport::TestCase + + RESPONSE_FULL = { + 'interfaces'=>{ + 'eth0'=>{'bootproto'=>'dhcp'}, + 'eth1'=>{'bootproto'=>'static', 'ipaddr'=>'192.168.3.27/24'}}, + 'routes'=>{'default'=>{'via'=>'10.20.7.254'}}, + 'dns'=>{'dnsservers'=>'10.20.0.15 10.20.0.8', 'dnsdomains'=>'suse.cz suse.de'}, + 'hostname'=>{'name'=>'linux', 'domain'=>'suse.cz'} + } + + def setup + YastService.stubs(:Call).with("YaPI::NETWORK::Read").returns(RESPONSE_FULL) + end + + def test_getter + route=Route.find('default') +# assert_equal("linux", hostname.name) +# assert_equal("suse.cz", hostname.domain) + end + +end + diff --git a/plugins/network/test/unit/routes_test.rb b/plugins/network/test/unit/routes_test.rb deleted file mode 100644 index 4b815aa..0000000 --- a/plugins/network/test/unit/routes_test.rb +++ /dev/null @@ -1,25 +0,0 @@ -require File.expand_path(File.dirname(__FILE__) + "/../test_helper") - -class RoutesTest < ActiveSupport::TestCase - - RESPONSE_FULL = { - 'interfaces'=>{ - 'eth0'=>{'bootproto'=>'dhcp'}, - 'eth1'=>{'bootproto'=>'static', 'ipaddr'=>'192.168.3.27/24'}}, - 'routes'=>{'default'=>'10.20.7.254'}, - 'dns'=>{'dnsservers'=>'10.20.0.15 10.20.0.8', 'dnsdomains'=>'suse.cz suse.de'}, - 'hostname'=>{'name'=>'linux', 'domain'=>'suse.cz'} - } - - def setup - YastService.stubs(:Call).with("YaPI::NETWORK::Read").returns(RESPONSE_FULL) - end - - def test_getter - hostname=Routes.find -# assert_equal("linux", hostname.name) -# assert_equal("suse.cz", hostname.domain) - 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