bellows 2.0.1 → 2.0.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+* Mon Aug 19 2013 Dan Prince <dprince@redhat.com> - 2.0.2
+  - Add support for new SS status types ('BuildFail', 'TestFail', etc.)
+  - Add support for automatic test failure approval.
+  - Add support for automatic build failure approval.
+
 * Mon Aug 12 2013 Dan Prince <dprince@redhat.com> - 2.0.1
   - Rename quantum to neutron.
 

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/bellows/smoke_stack.rb

@@ -191,15 +191,35 @@ module Bellows
 
     #returns true if jobs all passed (green) or all failed results are approved
     def self.complete?(job_datas)
-      approved = true
+      complete = true
       job_datas.each do |arr|
         job_type = arr[0]
         job_data = arr[1]
-        if job_data.nil? or (job_data['status'] == 'Failed' and (job_data['approved_by'].nil? and not job_type['auto_approved']))
-          approved = false
+        return false if job_data.nil? or (job_data['status'] and ['Pending', 'Running'].include?(job_data['status'])) # waiting on pending jobs or data
+
+        # if bellows doesn't understand the status then we fail
+        if not ['Pending', 'Running', 'Success', 'Failed', 'BuildFail', 'TestFail'].include?(job_data['status']) then
+          return false
         end
+
+        next if job_type['auto_approved'] # global auto_approved
+
+        # special case for build failures
+        if job_data['status'] == 'BuildFail' and not job_type['buildfail_auto_approved'] and not job_data['approved_by'] then
+          complete = false
+        end
+
+        # special case for test failures
+        if job_data['status'] == 'TestFail' and not job_type['testfail_auto_approved'] and not job_data['approved_by'] then
+          complete = false
+        end
+
+        if job_data['status'] == 'Failed' and not job_data['approved_by'] then
+          complete = false
+        end
+
       end
-      approved
+      complete
     end
 
   end

data/test/test_smoke_stack.rb

@@ -57,4 +57,138 @@ class SmokeStackTest < Test::Unit::TestCase
 
   end
 
+  def test_complete_with_single_success
+
+    comment_config = {'auto_approved' => false}
+    job_data = {'status' => 'Success', 'approved_by' => nil}
+    job_datas = [[comment_config, job_data]]
+
+    assert_equal true, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
+  def test_complete_with_single_failed
+
+    comment_config = {'auto_approved' => false}
+    job_data = {'status' => 'Failed', 'approved_by' => nil}
+    job_datas = [[comment_config, job_data]]
+
+    assert_equal false, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
+  def test_complete_with_single_failed_manually_approved
+
+    comment_config = {'auto_approved' => false}
+    job_data = {'status' => 'Failed', 'approved_by' => 'dprince'}
+    job_datas = [[comment_config, job_data]]
+
+    assert_equal true, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
+  def test_complete_with_single_failed_auto_approved
+
+    comment_config = {'auto_approved' => true}
+    job_data = {'status' => 'Failed', 'approved_by' => nil}
+    job_datas = [[comment_config, job_data]]
+
+    assert_equal true, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
+  def test_complete_with_invalid_job_status
+
+    comment_config = {'auto_approved' => true}
+    job_data = {'status' => 'Foo', 'approved_by' => 'dprince'}
+    job_datas = [[comment_config, job_data]]
+
+    assert_equal false, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
+  def test_complete_with_job_pending
+
+    job_datas = []
+    comment_config = {'auto_approved' => true}
+    job_data = {'status' => 'Success', 'approved_by' => nil}
+    job_datas << [comment_config, job_data]
+    comment_config = {'auto_approved' => true}
+    job_data = {'status' => 'Pending', 'approved_by' => 'dprince'}
+    job_datas << [comment_config, job_data]
+
+    assert_equal false, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
+  def test_complete_with_job_running
+
+    job_datas = []
+    comment_config = {'auto_approved' => true}
+    job_data = {'status' => 'Success', 'approved_by' => nil}
+    job_datas << [comment_config, job_data]
+    comment_config = {'auto_approved' => true}
+    job_data = {'status' => 'Pending', 'approved_by' => 'dprince'}
+    job_datas << [comment_config, job_data]
+
+    assert_equal false, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
+  def test_complete_with_build_fail_auto_approved
+
+    job_datas = []
+    comment_config = {'buildfail_auto_approved' => true}
+    job_data = {'status' => 'BuildFail', 'approved_by' => nil}
+    job_datas << [comment_config, job_data]
+    comment_config = {}
+    job_data = {'status' => 'Success', 'approved_by' => nil}
+    job_datas << [comment_config, job_data]
+
+    assert_equal true, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
+  def test_complete_with_build_fail_manually_approved
+
+    job_datas = []
+    comment_config = {'buildfail_auto_approved' => false}
+    job_data = {'status' => 'BuildFail', 'approved_by' => 'dprince'}
+    job_datas << [comment_config, job_data]
+    comment_config = {}
+    job_data = {'status' => 'Success', 'approved_by' => nil}
+    job_datas << [comment_config, job_data]
+
+    assert_equal true, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
+  def test_complete_with_build_fail_auto_approved
+
+    job_datas = []
+    comment_config = {'testfail_auto_approved' => true}
+    job_data = {'status' => 'TestFail', 'approved_by' => nil}
+    job_datas << [comment_config, job_data]
+    comment_config = {}
+    job_data = {'status' => 'Success', 'approved_by' => nil}
+    job_datas << [comment_config, job_data]
+
+    assert_equal true, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
+  def test_complete_with_build_fail_manually_approved
+
+    job_datas = []
+    comment_config = {'testfail_auto_approved' => false}
+    job_data = {'status' => 'TestFail', 'approved_by' => 'dprince'}
+    job_datas << [comment_config, job_data]
+    comment_config = {}
+    job_data = {'status' => 'Success', 'approved_by' => nil}
+    job_datas << [comment_config, job_data]
+
+    assert_equal true, Bellows::SmokeStack.complete?(job_datas)
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bellows
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3862304819193504318
+      hash: -3928135736151112540
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: