Non-zero exit on failure in release

nebhale · nebhale · commit bc0c60d5b780 · 2013-05-10T09:48:26.000-07:00
Previously, if a failure occurred in release, the exit code was
undefined. To meet the buildpack contract, a non-zero exit code is now
returned in the case of a failure in the release script.

[#49421559]
diff --git a/lib/java_buildpack/release.rb b/lib/java_buildpack/release.rb
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'java_buildpack/selected_jre'
 require 'java_buildpack/utils/properties'
 require 'yaml'
 
@@ -26,6 +27,7 @@ class Release
     # @param [String] app_dir The application directory used during release
     def initialize(app_dir)
       @app_dir = app_dir
+      @selected_jre = SelectedJre.new(app_dir)
     end
 
     # The execution entry point for release.  This method is responsible for generating a payload describing the execution
diff --git a/spec/bin/release_spec.rb b/spec/bin/release_spec.rb
@@ -0,0 +1,34 @@
+# Cloud Foundry Java Buildpack
+# Copyright (c) 2013 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+require 'open3'
+
+describe 'release script' do
+
+  it 'should return non-zero if failure' do
+    Open3.popen3("bin/release spec/fixtures/invalid_vendor") do |stdin, stdout, stderr, wait_thr|
+      expect(wait_thr.value).to_not be_success
+      expect(stderr.read).to eq("'sun' is not a valid Java runtime vendor\n")
+    end
+  end
+
+  it 'should return zero if success' do
+    Open3.popen3("bin/release spec/fixtures/single_system_properties") do |stdin, stdout, stderr, wait_thr|
+      expect(wait_thr.value).to be_success
+    end
+  end
+
+end
