Skip to content

Commit

Permalink
rubocop cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
wstephenson committed Sep 30, 2016
1 parent 0b8380b commit 19a9442
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
3 changes: 0 additions & 3 deletions features/activation.feature
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@
Feature: Test product activation

Scenario: System registration
# This should get the base product Name and store it in a variable
Given I have a system with activated base product

Then a file named "/etc/zypp/credentials.d/SCCcredentials" should exist
And the file "/etc/zypp/credentials.d/SCCcredentials" should contain "SCC_"

# This needs to match _SP1_, _SP2
And zypp credentials for base should exist
#And a file named "/etc/zypp/credentials.d/SUSE_Linux_Enterprise_Server_12_x86_64" should exist
And zypp credentials for base should contain "SCC_"

And zypper should contain a service for base product
Expand Down
4 changes: 1 addition & 3 deletions features/step_definition/integration_steps.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"SUSE_Linux_Enterprise_Server_#{version_string_uscore}_x86_64:SLES#{version_string_dash}-Updates",
"SUSE_Linux_Enterprise_Server_#{version_string_uscore}_x86_64:SLES#{version_string_dash}-Debuginfo-Updates"
]
elsif product == "sdk"
elsif product == 'sdk'
repositories = [
"SUSE_Linux_Enterprise_Software_Development_Kit_#{version_string_uscore}_x86_64:SLE-SDK#{version_string_dash}-Pool",
"SUSE_Linux_Enterprise_Software_Development_Kit_#{version_string_uscore}_x86_64:SLE-SDK#{version_string_dash}-Updates"
Expand All @@ -70,13 +70,11 @@
end

Then(/zypp credentials for (base|sdk|wsm) (should|should not) exist$/) do |product, condition|
#underscore_product_cred_file = ("%s %s %s" % [product, version, arch]).tr(' ', '_')
credentials_path = '/etc/zypp/credentials.d/'
step "a file named \"#{credentials_path}#{service_name}\" #{condition} exist"
end

Then(/zypp credentials for (base|sdk|wsm) (should|should not) contain "(.*)"$/) do |product, condition, content|
#underscore_product_cred_file = ("%s %s %s" % [product, version, arch]).tr(' ', '_')
credentials_path = '/etc/zypp/credentials.d/'
step "the file \"#{credentials_path}#{service_name}\" #{condition} contain \"#{content}\""
end
Expand Down

0 comments on commit 19a9442

Please sign in to comment.