August 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <rest-service> master : status module: fixed evaluation of intervals for metrics
by Bjoern Geuken 31 Aug '09

31 Aug '09

ref: refs/heads/master commit 7fd7a8616e46b77b97d668b6782283864d32295b Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Mon Aug 31 12:49:45 2009 +0200 status module: fixed evaluation of intervals for metrics --- plugins/status/lib/status.rb | 33 ++++++++++++------------------ plugins/status/test/unit/status_test.rb | 3 +- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index 8628dde..58b7344 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -9,9 +9,8 @@ class Status :health_status, :metrics, :limits -#=begin + def to_xml(options = {}) -# puts @limits.inspect xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] @@ -20,7 +19,7 @@ class Status data.each {|metric, data| xml.metric(:name => metric, :metricgroup => metric_group) do xml.starttime(@data[metric_group][metric]["starttime"]) - xml.interval(5) + xml.interval(@data[metric_group][metric]["interval"]) data.each {|label,data| unless label == "starttime" or label == "interval" xml.label(:type => "hash", :name => label) do @@ -201,43 +200,37 @@ class Status end unless labels.blank? # set values for each label and time + # evaluates interval and starttime once for each metric (not each label) + nexttime = 9.9e+99 + result["starttime"] = 9.9e+99 lines.each do |l| # each time unless l.blank? if l =~ /\d*:\D*/ pair = l.split ":" values = pair[1].split " " - #puts pair[1] column = 0 values.each do |v| # each label - result["starttime"] ||= pair[0] - result["starttime"] = pair[0] if pair[0].to_i < result["starttime"].to_i - nexttime = + if result["interval"].nil? + if pair[0].to_i < result["starttime"].to_i + result["starttime"] = pair[0].to_i + elsif pair[0].to_i < nexttime and pair[0].to_i > result["starttime"].to_i + nexttime = pair[0].to_i + end + end if v != "nan" #store valid values only result["#{labels[column]}"] ||= Hash.new -# result["#{labels[column]}"].merge!(v) result["#{labels[column]}"].merge!({"#{pair[0].chomp(": ")}" => v}) - #result["#{labels[column]}"].merge!({"T_#{pair[0].chomp(": ")}" => v}) column += 1 else result["#{labels[column]}"] ||= Hash.new -# result["#{labels[column]}"].merge!("invalid") result["#{labels[column]}"].merge!({"#{pair[0].chomp(": ")}" => "invalid"}) end end end end end - #setting the limits -# result.each do |key, value| -# path = rrdfile[datapath.length+1..rrdfile.length-1].chomp('.rrd') -# path +="/" + key if key!="value" #do not take care about the value flag -# path = path.tr('-','_') -# if @limits.has_key?(path) -# result[key] ||= Hash.new -# result[key].merge!({"limit" => @limits[path] }) -# end -# end + result["interval"] = nexttime.to_i - result["starttime"].to_i if result["interval"].nil? return result else raise "error reading data from rrdtool" diff --git a/plugins/status/test/unit/status_test.rb b/plugins/status/test/unit/status_test.rb index 26c61dd..06eb93b 100644 --- a/plugins/status/test/unit/status_test.rb +++ b/plugins/status/test/unit/status_test.rb @@ -115,7 +115,8 @@ EOF "1248092930"=>"2.5092857143e+01", "1248092160"=>"invalid", "1248092370"=>"4.7314285714e+01"}, - "starttime"=>"1248092090"} + "interval"=>70, + "starttime"=>1248092090} assert_equal expected_response, status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) 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 : status module: fixed evaluation of intervals for metrics
by Bjoern Geuken 31 Aug '09

31 Aug '09

ref: refs/heads/network commit 7fd7a8616e46b77b97d668b6782283864d32295b Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Mon Aug 31 12:49:45 2009 +0200 status module: fixed evaluation of intervals for metrics --- plugins/status/lib/status.rb | 33 ++++++++++++------------------ plugins/status/test/unit/status_test.rb | 3 +- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index 8628dde..58b7344 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -9,9 +9,8 @@ class Status :health_status, :metrics, :limits -#=begin + def to_xml(options = {}) -# puts @limits.inspect xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] @@ -20,7 +19,7 @@ class Status data.each {|metric, data| xml.metric(:name => metric, :metricgroup => metric_group) do xml.starttime(@data[metric_group][metric]["starttime"]) - xml.interval(5) + xml.interval(@data[metric_group][metric]["interval"]) data.each {|label,data| unless label == "starttime" or label == "interval" xml.label(:type => "hash", :name => label) do @@ -201,43 +200,37 @@ class Status end unless labels.blank? # set values for each label and time + # evaluates interval and starttime once for each metric (not each label) + nexttime = 9.9e+99 + result["starttime"] = 9.9e+99 lines.each do |l| # each time unless l.blank? if l =~ /\d*:\D*/ pair = l.split ":" values = pair[1].split " " - #puts pair[1] column = 0 values.each do |v| # each label - result["starttime"] ||= pair[0] - result["starttime"] = pair[0] if pair[0].to_i < result["starttime"].to_i - nexttime = + if result["interval"].nil? + if pair[0].to_i < result["starttime"].to_i + result["starttime"] = pair[0].to_i + elsif pair[0].to_i < nexttime and pair[0].to_i > result["starttime"].to_i + nexttime = pair[0].to_i + end + end if v != "nan" #store valid values only result["#{labels[column]}"] ||= Hash.new -# result["#{labels[column]}"].merge!(v) result["#{labels[column]}"].merge!({"#{pair[0].chomp(": ")}" => v}) - #result["#{labels[column]}"].merge!({"T_#{pair[0].chomp(": ")}" => v}) column += 1 else result["#{labels[column]}"] ||= Hash.new -# result["#{labels[column]}"].merge!("invalid") result["#{labels[column]}"].merge!({"#{pair[0].chomp(": ")}" => "invalid"}) end end end end end - #setting the limits -# result.each do |key, value| -# path = rrdfile[datapath.length+1..rrdfile.length-1].chomp('.rrd') -# path +="/" + key if key!="value" #do not take care about the value flag -# path = path.tr('-','_') -# if @limits.has_key?(path) -# result[key] ||= Hash.new -# result[key].merge!({"limit" => @limits[path] }) -# end -# end + result["interval"] = nexttime.to_i - result["starttime"].to_i if result["interval"].nil? return result else raise "error reading data from rrdtool" diff --git a/plugins/status/test/unit/status_test.rb b/plugins/status/test/unit/status_test.rb index 26c61dd..06eb93b 100644 --- a/plugins/status/test/unit/status_test.rb +++ b/plugins/status/test/unit/status_test.rb @@ -115,7 +115,8 @@ EOF "1248092930"=>"2.5092857143e+01", "1248092160"=>"invalid", "1248092370"=>"4.7314285714e+01"}, - "starttime"=>"1248092090"} + "interval"=>70, + "starttime"=>1248092090} assert_equal expected_response, status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) 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 : status module: fixed evaluation of intervals for metrics
by Bjoern Geuken 31 Aug '09

31 Aug '09

ref: refs/heads/basesystem commit 7fd7a8616e46b77b97d668b6782283864d32295b Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Mon Aug 31 12:49:45 2009 +0200 status module: fixed evaluation of intervals for metrics --- plugins/status/lib/status.rb | 33 ++++++++++++------------------ plugins/status/test/unit/status_test.rb | 3 +- 2 files changed, 15 insertions(+), 21 deletions(-) diff --git a/plugins/status/lib/status.rb b/plugins/status/lib/status.rb index 8628dde..58b7344 100644 --- a/plugins/status/lib/status.rb +++ b/plugins/status/lib/status.rb @@ -9,9 +9,8 @@ class Status :health_status, :metrics, :limits -#=begin + def to_xml(options = {}) -# puts @limits.inspect xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] @@ -20,7 +19,7 @@ class Status data.each {|metric, data| xml.metric(:name => metric, :metricgroup => metric_group) do xml.starttime(@data[metric_group][metric]["starttime"]) - xml.interval(5) + xml.interval(@data[metric_group][metric]["interval"]) data.each {|label,data| unless label == "starttime" or label == "interval" xml.label(:type => "hash", :name => label) do @@ -201,43 +200,37 @@ class Status end unless labels.blank? # set values for each label and time + # evaluates interval and starttime once for each metric (not each label) + nexttime = 9.9e+99 + result["starttime"] = 9.9e+99 lines.each do |l| # each time unless l.blank? if l =~ /\d*:\D*/ pair = l.split ":" values = pair[1].split " " - #puts pair[1] column = 0 values.each do |v| # each label - result["starttime"] ||= pair[0] - result["starttime"] = pair[0] if pair[0].to_i < result["starttime"].to_i - nexttime = + if result["interval"].nil? + if pair[0].to_i < result["starttime"].to_i + result["starttime"] = pair[0].to_i + elsif pair[0].to_i < nexttime and pair[0].to_i > result["starttime"].to_i + nexttime = pair[0].to_i + end + end if v != "nan" #store valid values only result["#{labels[column]}"] ||= Hash.new -# result["#{labels[column]}"].merge!(v) result["#{labels[column]}"].merge!({"#{pair[0].chomp(": ")}" => v}) - #result["#{labels[column]}"].merge!({"T_#{pair[0].chomp(": ")}" => v}) column += 1 else result["#{labels[column]}"] ||= Hash.new -# result["#{labels[column]}"].merge!("invalid") result["#{labels[column]}"].merge!({"#{pair[0].chomp(": ")}" => "invalid"}) end end end end end - #setting the limits -# result.each do |key, value| -# path = rrdfile[datapath.length+1..rrdfile.length-1].chomp('.rrd') -# path +="/" + key if key!="value" #do not take care about the value flag -# path = path.tr('-','_') -# if @limits.has_key?(path) -# result[key] ||= Hash.new -# result[key].merge!({"limit" => @limits[path] }) -# end -# end + result["interval"] = nexttime.to_i - result["starttime"].to_i if result["interval"].nil? return result else raise "error reading data from rrdtool" diff --git a/plugins/status/test/unit/status_test.rb b/plugins/status/test/unit/status_test.rb index 26c61dd..06eb93b 100644 --- a/plugins/status/test/unit/status_test.rb +++ b/plugins/status/test/unit/status_test.rb @@ -115,7 +115,8 @@ EOF "1248092930"=>"2.5092857143e+01", "1248092160"=>"invalid", "1248092370"=>"4.7314285714e+01"}, - "starttime"=>"1248092090"} + "interval"=>70, + "starttime"=>1248092090} assert_equal expected_response, status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) 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 : status module: fixed views
by Bjoern Geuken 31 Aug '09

31 Aug '09

ref: refs/heads/master commit 2284a219379ca856c0fc79ee621c5027245ecd79 Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Mon Aug 31 11:38:59 2009 +0200 status module: fixed views --- plugins/status/app/views/status/show.html.erb | 2 +- plugins/status/app/views/status/show.xml.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/status/app/views/status/show.html.erb b/plugins/status/app/views/status/show.html.erb index e02050f..2cc15b8 100644 --- a/plugins/status/app/views/status/show.html.erb +++ b/plugins/status/app/views/status/show.html.erb @@ -1,2 +1,2 @@ -<%= @status.data.to_xml( :root => "status", :dasherize => false ) -%> +<%= @status.to_xml( :root => "status", :dasherize => false ) -%> diff --git a/plugins/status/app/views/status/show.xml.erb b/plugins/status/app/views/status/show.xml.erb index e02050f..2cc15b8 100644 --- a/plugins/status/app/views/status/show.xml.erb +++ b/plugins/status/app/views/status/show.xml.erb @@ -1,2 +1,2 @@ -<%= @status.data.to_xml( :root => "status", :dasherize => false ) -%> +<%= @status.to_xml( :root => "status", :dasherize => false ) -%> -- 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 : status module: fixed views
by Bjoern Geuken 31 Aug '09

31 Aug '09

ref: refs/heads/network commit 2284a219379ca856c0fc79ee621c5027245ecd79 Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Mon Aug 31 11:38:59 2009 +0200 status module: fixed views --- plugins/status/app/views/status/show.html.erb | 2 +- plugins/status/app/views/status/show.xml.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/status/app/views/status/show.html.erb b/plugins/status/app/views/status/show.html.erb index e02050f..2cc15b8 100644 --- a/plugins/status/app/views/status/show.html.erb +++ b/plugins/status/app/views/status/show.html.erb @@ -1,2 +1,2 @@ -<%= @status.data.to_xml( :root => "status", :dasherize => false ) -%> +<%= @status.to_xml( :root => "status", :dasherize => false ) -%> diff --git a/plugins/status/app/views/status/show.xml.erb b/plugins/status/app/views/status/show.xml.erb index e02050f..2cc15b8 100644 --- a/plugins/status/app/views/status/show.xml.erb +++ b/plugins/status/app/views/status/show.xml.erb @@ -1,2 +1,2 @@ -<%= @status.data.to_xml( :root => "status", :dasherize => false ) -%> +<%= @status.to_xml( :root => "status", :dasherize => false ) -%> -- 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 : status module: fixed views
by Bjoern Geuken 31 Aug '09

31 Aug '09

ref: refs/heads/basesystem commit 2284a219379ca856c0fc79ee621c5027245ecd79 Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Mon Aug 31 11:38:59 2009 +0200 status module: fixed views --- plugins/status/app/views/status/show.html.erb | 2 +- plugins/status/app/views/status/show.xml.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/status/app/views/status/show.html.erb b/plugins/status/app/views/status/show.html.erb index e02050f..2cc15b8 100644 --- a/plugins/status/app/views/status/show.html.erb +++ b/plugins/status/app/views/status/show.html.erb @@ -1,2 +1,2 @@ -<%= @status.data.to_xml( :root => "status", :dasherize => false ) -%> +<%= @status.to_xml( :root => "status", :dasherize => false ) -%> diff --git a/plugins/status/app/views/status/show.xml.erb b/plugins/status/app/views/status/show.xml.erb index e02050f..2cc15b8 100644 --- a/plugins/status/app/views/status/show.xml.erb +++ b/plugins/status/app/views/status/show.xml.erb @@ -1,2 +1,2 @@ -<%= @status.data.to_xml( :root => "status", :dasherize => false ) -%> +<%= @status.to_xml( :root => "status", :dasherize => false ) -%> -- 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] Build failed in Hudson: webyast-service-head-i586 #257
by Hudson Integration Service 31 Aug '09

31 Aug '09

See http://yast.suse.de:3334/job/webyast-service-head-i586/257/changes Changes: [root] status module: added new xml format ------------------------------------------ [...truncated 500 lines...] Started .......... Finished in 1.262959 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.6e-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.430774 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.716283 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 5.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/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.57329 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.573967 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 8.7e-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 1.848732 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.713097 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 2

[yast-commit] <rest-service> master : status module: fixed tests
by Bjoern Geuken 31 Aug '09

31 Aug '09

ref: refs/heads/master commit 373005514895fa44cbd2e8f7665423d301a4f462 Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Mon Aug 31 10:03:29 2009 +0200 status module: fixed tests --- .../status/app/controllers/status_controller.rb | 3 +- .../test/functional/status_controller_test.rb | 61 ++++++++++-------- plugins/status/test/unit/status_test.rb | 67 +++++++++++--------- 3 files changed, 70 insertions(+), 61 deletions(-) diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb index e5033c2..13db52d 100644 --- a/plugins/status/app/controllers/status_controller.rb +++ b/plugins/status/app/controllers/status_controller.rb @@ -73,7 +73,7 @@ class StatusController < ApplicationController # GET /status/1 # GET /status/1.xml def show - unless true #permission_check("org.opensuse.yast.system.status.read") + unless permission_check("org.opensuse.yast.system.status.read") render ErrorResult.error(403, 1, "no permission") and return else begin @@ -81,7 +81,6 @@ class StatusController < ApplicationController stop = params[:stop].blank? ? Time.now : Time.at(params[:stop].to_i) start = params[:start].blank? ? stop - 300 : Time.at(params[:start].to_i) @status.collect_data(start, stop, params[:data]) - puts @status.data.inspect rescue Exception => e render :text => e.to_s, :status => 400 # bad request end diff --git a/plugins/status/test/functional/status_controller_test.rb b/plugins/status/test/functional/status_controller_test.rb index 77ac519..e75c085 100644 --- a/plugins/status/test/functional/status_controller_test.rb +++ b/plugins/status/test/functional/status_controller_test.rb @@ -15,41 +15,46 @@ class StatusControllerTest < ActionController::TestCase Status.any_instance.stubs(:datapath).returns("/var/lib/collectd/test") expected_response = {"tx"=> - {"T_1248093000"=>"1.5542857143e+01", - "T_1248092930"=>"2.8285714286e+00", - "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_1248093000"=>"3.1314285714e+01", - "T_1248092930"=>"2.5092857143e+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"}} + {"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"} Status.any_instance.stubs(:fetch_metric).returns(expected_response) Status.stubs(:find).returns([Status.new, Status.new]) - + @controller = StatusController.new @request = ActionController::TestRequest.new # http://railsforum.com/viewtopic.php?id=1719 @request.session[:account_id] = 1 # defined in fixtures - end + end include PluginBasicTests @@ -61,7 +66,7 @@ class StatusControllerTest < ActionController::TestCase # nothing end - # FIXME + # FIXME def test_access_show_json # ActionView::MissingTemplate: Missing template status/show.erb in view path app/views:. end diff --git a/plugins/status/test/unit/status_test.rb b/plugins/status/test/unit/status_test.rb index 307d544..26c61dd 100644 --- a/plugins/status/test/unit/status_test.rb +++ b/plugins/status/test/unit/status_test.rb @@ -20,7 +20,7 @@ class StatusTest < ActiveSupport::TestCase def test_set_datapath_default Scr.instance.stubs(:execute).with(["/usr/sbin/collectd"]).returns(nil) - + IO.stubs(:popen).with("hostname").returns(String) #FIXME: replace String with IO IO.stubs(:popen).with("domainname").returns(String) # returns(IO.new(2, "r+")) dont work IO.stubs(:popen).with("ls /var/lib/collectd/").returns(String) # because of missing EOF token @@ -41,7 +41,7 @@ class StatusTest < ActiveSupport::TestCase status.stubs(:metric_types).returns(['cpu', 'memory']) status.stubs(:metric_files).with('cpu').returns(['/var/lib/collectd/test/cpu/cpuheat.rrd']) status.stubs(:metric_files).with('memory').returns(['/var/lib/collectd/test/memory/memory.rrd']) - + status.datapath = "/var/lib/collectd" fake_metrics = {"memory"=>{:rrds=>["/var/lib/collectd/test/memory/memory.rrd"]}, "cpu"=>{:rrds=>["/var/lib/collectd/test/cpu/cpuheat.rrd"]}} @@ -56,7 +56,7 @@ class StatusTest < ActiveSupport::TestCase Scr.instance.stubs(:execute).with(["/usr/sbin/collectd"]).returns(nil) stop = Time.now start = Time.now - 300 - + status = Status.new rrd_output = <<EOF @@ -79,39 +79,44 @@ class StatusTest < ActiveSupport::TestCase 1248093070: 2.3064285714e+01 2.7071428571e+00 1248093140: nan nan EOF - + # stub the command output status.stubs(:run_rrdtool).with("/var/lib/collectd/test/memory-free.rrd", start, stop).returns(rrd_output) - + status.datapath = "/test" expected_response = {"tx"=> - {"T_1248093000"=>"1.5542857143e+01", - "T_1248092930"=>"2.8285714286e+00", - "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"}, + {"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"=> - {"T_1248093000"=>"3.1314285714e+01", - "T_1248092930"=>"2.5092857143e+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"}} - - assert_equal expected_response, status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) + {"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"} + + assert_equal expected_response, status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) 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> network : status module: fixed tests
by Bjoern Geuken 31 Aug '09

31 Aug '09

ref: refs/heads/network commit 373005514895fa44cbd2e8f7665423d301a4f462 Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Mon Aug 31 10:03:29 2009 +0200 status module: fixed tests --- .../status/app/controllers/status_controller.rb | 3 +- .../test/functional/status_controller_test.rb | 61 ++++++++++-------- plugins/status/test/unit/status_test.rb | 67 +++++++++++--------- 3 files changed, 70 insertions(+), 61 deletions(-) diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb index e5033c2..13db52d 100644 --- a/plugins/status/app/controllers/status_controller.rb +++ b/plugins/status/app/controllers/status_controller.rb @@ -73,7 +73,7 @@ class StatusController < ApplicationController # GET /status/1 # GET /status/1.xml def show - unless true #permission_check("org.opensuse.yast.system.status.read") + unless permission_check("org.opensuse.yast.system.status.read") render ErrorResult.error(403, 1, "no permission") and return else begin @@ -81,7 +81,6 @@ class StatusController < ApplicationController stop = params[:stop].blank? ? Time.now : Time.at(params[:stop].to_i) start = params[:start].blank? ? stop - 300 : Time.at(params[:start].to_i) @status.collect_data(start, stop, params[:data]) - puts @status.data.inspect rescue Exception => e render :text => e.to_s, :status => 400 # bad request end diff --git a/plugins/status/test/functional/status_controller_test.rb b/plugins/status/test/functional/status_controller_test.rb index 77ac519..e75c085 100644 --- a/plugins/status/test/functional/status_controller_test.rb +++ b/plugins/status/test/functional/status_controller_test.rb @@ -15,41 +15,46 @@ class StatusControllerTest < ActionController::TestCase Status.any_instance.stubs(:datapath).returns("/var/lib/collectd/test") expected_response = {"tx"=> - {"T_1248093000"=>"1.5542857143e+01", - "T_1248092930"=>"2.8285714286e+00", - "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_1248093000"=>"3.1314285714e+01", - "T_1248092930"=>"2.5092857143e+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"}} + {"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"} Status.any_instance.stubs(:fetch_metric).returns(expected_response) Status.stubs(:find).returns([Status.new, Status.new]) - + @controller = StatusController.new @request = ActionController::TestRequest.new # http://railsforum.com/viewtopic.php?id=1719 @request.session[:account_id] = 1 # defined in fixtures - end + end include PluginBasicTests @@ -61,7 +66,7 @@ class StatusControllerTest < ActionController::TestCase # nothing end - # FIXME + # FIXME def test_access_show_json # ActionView::MissingTemplate: Missing template status/show.erb in view path app/views:. end diff --git a/plugins/status/test/unit/status_test.rb b/plugins/status/test/unit/status_test.rb index 307d544..26c61dd 100644 --- a/plugins/status/test/unit/status_test.rb +++ b/plugins/status/test/unit/status_test.rb @@ -20,7 +20,7 @@ class StatusTest < ActiveSupport::TestCase def test_set_datapath_default Scr.instance.stubs(:execute).with(["/usr/sbin/collectd"]).returns(nil) - + IO.stubs(:popen).with("hostname").returns(String) #FIXME: replace String with IO IO.stubs(:popen).with("domainname").returns(String) # returns(IO.new(2, "r+")) dont work IO.stubs(:popen).with("ls /var/lib/collectd/").returns(String) # because of missing EOF token @@ -41,7 +41,7 @@ class StatusTest < ActiveSupport::TestCase status.stubs(:metric_types).returns(['cpu', 'memory']) status.stubs(:metric_files).with('cpu').returns(['/var/lib/collectd/test/cpu/cpuheat.rrd']) status.stubs(:metric_files).with('memory').returns(['/var/lib/collectd/test/memory/memory.rrd']) - + status.datapath = "/var/lib/collectd" fake_metrics = {"memory"=>{:rrds=>["/var/lib/collectd/test/memory/memory.rrd"]}, "cpu"=>{:rrds=>["/var/lib/collectd/test/cpu/cpuheat.rrd"]}} @@ -56,7 +56,7 @@ class StatusTest < ActiveSupport::TestCase Scr.instance.stubs(:execute).with(["/usr/sbin/collectd"]).returns(nil) stop = Time.now start = Time.now - 300 - + status = Status.new rrd_output = <<EOF @@ -79,39 +79,44 @@ class StatusTest < ActiveSupport::TestCase 1248093070: 2.3064285714e+01 2.7071428571e+00 1248093140: nan nan EOF - + # stub the command output status.stubs(:run_rrdtool).with("/var/lib/collectd/test/memory-free.rrd", start, stop).returns(rrd_output) - + status.datapath = "/test" expected_response = {"tx"=> - {"T_1248093000"=>"1.5542857143e+01", - "T_1248092930"=>"2.8285714286e+00", - "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"}, + {"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"=> - {"T_1248093000"=>"3.1314285714e+01", - "T_1248092930"=>"2.5092857143e+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"}} - - assert_equal expected_response, status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) + {"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"} + + assert_equal expected_response, status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) 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> basesystem : status module: fixed tests
by Bjoern Geuken 31 Aug '09

31 Aug '09

ref: refs/heads/basesystem commit 373005514895fa44cbd2e8f7665423d301a4f462 Author: Bjoern Geuken <bgeuken(a)suse.de> Date: Mon Aug 31 10:03:29 2009 +0200 status module: fixed tests --- .../status/app/controllers/status_controller.rb | 3 +- .../test/functional/status_controller_test.rb | 61 ++++++++++-------- plugins/status/test/unit/status_test.rb | 67 +++++++++++--------- 3 files changed, 70 insertions(+), 61 deletions(-) diff --git a/plugins/status/app/controllers/status_controller.rb b/plugins/status/app/controllers/status_controller.rb index e5033c2..13db52d 100644 --- a/plugins/status/app/controllers/status_controller.rb +++ b/plugins/status/app/controllers/status_controller.rb @@ -73,7 +73,7 @@ class StatusController < ApplicationController # GET /status/1 # GET /status/1.xml def show - unless true #permission_check("org.opensuse.yast.system.status.read") + unless permission_check("org.opensuse.yast.system.status.read") render ErrorResult.error(403, 1, "no permission") and return else begin @@ -81,7 +81,6 @@ class StatusController < ApplicationController stop = params[:stop].blank? ? Time.now : Time.at(params[:stop].to_i) start = params[:start].blank? ? stop - 300 : Time.at(params[:start].to_i) @status.collect_data(start, stop, params[:data]) - puts @status.data.inspect rescue Exception => e render :text => e.to_s, :status => 400 # bad request end diff --git a/plugins/status/test/functional/status_controller_test.rb b/plugins/status/test/functional/status_controller_test.rb index 77ac519..e75c085 100644 --- a/plugins/status/test/functional/status_controller_test.rb +++ b/plugins/status/test/functional/status_controller_test.rb @@ -15,41 +15,46 @@ class StatusControllerTest < ActionController::TestCase Status.any_instance.stubs(:datapath).returns("/var/lib/collectd/test") expected_response = {"tx"=> - {"T_1248093000"=>"1.5542857143e+01", - "T_1248092930"=>"2.8285714286e+00", - "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_1248093000"=>"3.1314285714e+01", - "T_1248092930"=>"2.5092857143e+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"}} + {"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"} Status.any_instance.stubs(:fetch_metric).returns(expected_response) Status.stubs(:find).returns([Status.new, Status.new]) - + @controller = StatusController.new @request = ActionController::TestRequest.new # http://railsforum.com/viewtopic.php?id=1719 @request.session[:account_id] = 1 # defined in fixtures - end + end include PluginBasicTests @@ -61,7 +66,7 @@ class StatusControllerTest < ActionController::TestCase # nothing end - # FIXME + # FIXME def test_access_show_json # ActionView::MissingTemplate: Missing template status/show.erb in view path app/views:. end diff --git a/plugins/status/test/unit/status_test.rb b/plugins/status/test/unit/status_test.rb index 307d544..26c61dd 100644 --- a/plugins/status/test/unit/status_test.rb +++ b/plugins/status/test/unit/status_test.rb @@ -20,7 +20,7 @@ class StatusTest < ActiveSupport::TestCase def test_set_datapath_default Scr.instance.stubs(:execute).with(["/usr/sbin/collectd"]).returns(nil) - + IO.stubs(:popen).with("hostname").returns(String) #FIXME: replace String with IO IO.stubs(:popen).with("domainname").returns(String) # returns(IO.new(2, "r+")) dont work IO.stubs(:popen).with("ls /var/lib/collectd/").returns(String) # because of missing EOF token @@ -41,7 +41,7 @@ class StatusTest < ActiveSupport::TestCase status.stubs(:metric_types).returns(['cpu', 'memory']) status.stubs(:metric_files).with('cpu').returns(['/var/lib/collectd/test/cpu/cpuheat.rrd']) status.stubs(:metric_files).with('memory').returns(['/var/lib/collectd/test/memory/memory.rrd']) - + status.datapath = "/var/lib/collectd" fake_metrics = {"memory"=>{:rrds=>["/var/lib/collectd/test/memory/memory.rrd"]}, "cpu"=>{:rrds=>["/var/lib/collectd/test/cpu/cpuheat.rrd"]}} @@ -56,7 +56,7 @@ class StatusTest < ActiveSupport::TestCase Scr.instance.stubs(:execute).with(["/usr/sbin/collectd"]).returns(nil) stop = Time.now start = Time.now - 300 - + status = Status.new rrd_output = <<EOF @@ -79,39 +79,44 @@ class StatusTest < ActiveSupport::TestCase 1248093070: 2.3064285714e+01 2.7071428571e+00 1248093140: nan nan EOF - + # stub the command output status.stubs(:run_rrdtool).with("/var/lib/collectd/test/memory-free.rrd", start, stop).returns(rrd_output) - + status.datapath = "/test" expected_response = {"tx"=> - {"T_1248093000"=>"1.5542857143e+01", - "T_1248092930"=>"2.8285714286e+00", - "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"}, + {"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"=> - {"T_1248093000"=>"3.1314285714e+01", - "T_1248092930"=>"2.5092857143e+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"}} - - assert_equal expected_response, status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) + {"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"} + + assert_equal expected_response, status.fetch_metric("/var/lib/collectd/test/memory-free.rrd", start, stop) 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