Merge pull request #6291 from Miciah/fix-gear-extended-tests

Merged by openshift-bot

Author: OpenShift Bot

controller/test/cucumber/step_definitions/upgrade_steps.rb

@@ -387,7 +387,7 @@ def touch_marker(name)
 EOF
 
   IO.write('/tmp/gear_upgrade.rb', gear_upgrade_content)
-  `echo 'GEAR_UPGRADE_EXTENSION=/tmp/gear_upgrade' >> /etc/openshift/node.conf`
+  `echo '\nGEAR_UPGRADE_EXTENSION=/tmp/gear_upgrade' >> /etc/openshift/node.conf`
 end
 
 Given /^a gear level upgrade extension to map the updated software version exists$/ do
@@ -446,7 +446,7 @@ def map_ident(progress, ident)
 end
 EOF
   IO.write('/tmp/gear_upgrade.rb', gear_upgrade_content)
-  `echo 'GEAR_UPGRADE_EXTENSION=/tmp/gear_upgrade' >> /etc/openshift/node.conf`
+  `echo '\nGEAR_UPGRADE_EXTENSION=/tmp/gear_upgrade' >> /etc/openshift/node.conf`
 end
 
 Then /^the invocation markers from the gear upgrade should exist$/ do

controller/test/cucumber/support/gear_upgrade_helper.rb

@@ -7,5 +7,6 @@
 end
 
 def clean_gear_upgrade_extension_from_node_conf
-  `sed -i /etc/openshift/node.conf -e s,GEAR_UPGRADE_EXTENSION.*,,g`
+  `sed -i /etc/openshift/node.conf -e /GEAR_UPGRADE_EXTENSION/d`
+  `sed -i /etc/openshift/node.conf -e '${/^$/d}'`
 end