Merge pull request #8340 from luchihoratiu/maint-fix-disable-i18n-acceptance-tests

(maint) Fix i18n acceptance tests

Author: mihaibuzgau

acceptance/tests/i18n/enable_option_disable_i18n.rb

@@ -1,7 +1,7 @@
 test_name 'Verify that disable_i18n can be set to true and have translations disabled' do
   confine :except, :platform => /^solaris/ # translation not supported
 
-  tag 'audit:high',
+  tag 'audit:medium',
       'audit:acceptance'
 
   require 'puppet/acceptance/environment_utils.rb'
@@ -25,8 +25,10 @@
     install_i18n_demo_module(master, tmp_environment)
   end
 
+  disable_i18n_default_master = master.puppet['disable_i18n']
   teardown do
     step 'resetting the server locale' do
+      on(master, puppet("config set disable_i18n #{ disable_i18n_default_master }"))
       reset_master_system_locale
     end
     step 'uninstall the module' do
@@ -42,9 +44,15 @@
     skip_test("test machine is missing #{agent_language} locale. Skipping") if agent_language.nil?
     shell_env_language = { 'LANGUAGE' => agent_language, 'LANG' => agent_language }
 
+    disable_i18n_default_agent = agent.puppet['disable_i18n']
+    teardown do
+      on(agent, puppet("config set disable_i18n #{ disable_i18n_default_agent }"))
+    end
+
     step 'enable i18n' do
-      on(master, puppet("config set disable_i18n false"))
       on(agent, puppet("config set disable_i18n false"))
+      on(master, puppet("config set disable_i18n false"))
+      reset_master_system_locale
     end
 
     step 'expect #{language} translation for a custom type' do
@@ -60,8 +68,9 @@
     end
 
     step 'disable i18n' do
-      on(master, puppet("config set disable_i18n true"))
       on(agent, puppet("config set disable_i18n true"))
+      on(master, puppet("config set disable_i18n true"))
+      reset_master_system_locale
     end
 
     step 'expect no #{language} translation for a custom type' do

acceptance/tests/i18n/modules/puppet_agent.rb

@@ -14,14 +14,16 @@
   extend Puppet::Acceptance::I18nDemoUtils
 
   language = 'ja_JP'
-  step "configure server locale to #{language}" do
-    configure_master_system_locale(language)
-  end
+  disable_i18n_default_master = master.puppet['disable_i18n']
 
   step 'enable i18n on master' do
     on(master, puppet("config set disable_i18n false"))
   end
 
+  step "configure server locale to #{language}" do
+    configure_master_system_locale(language)
+  end
+
   tmp_environment = mk_tmp_environment_with_teardown(master, File.basename(__FILE__, '.*'))
 
   step 'install a i18ndemo module' do
@@ -30,6 +32,7 @@
 
   teardown do
     step 'resetting the server locale' do
+      on(master, puppet("config set disable_i18n #{ disable_i18n_default_master }"))
       reset_master_system_locale
     end
     step 'uninstall the module' do
@@ -48,7 +51,9 @@
     shell_env_language = { 'LANGUAGE' => agent_language, 'LANG' => agent_language }
 
     type_path = agent.tmpdir('provider')
+    disable_i18n_default_agent = agent.puppet['disable_i18n']
     teardown do
+      on(agent, puppet("config set disable_i18n #{ disable_i18n_default_agent }"))
       agent.rm_rf(type_path)
     end
 

acceptance/tests/i18n/modules/puppet_agent_cached_catalog.rb

@@ -1,7 +1,7 @@
 test_name 'C100566: puppet agent with module should translate messages when using a cached catalog' do
   confine :except, :platform => /^solaris/ # translation not supported
 
-  tag 'audit:high',
+  tag 'audit:medium',
       'audit:acceptance'
 
   require 'puppet/acceptance/environment_utils.rb'
@@ -14,14 +14,16 @@
   extend Puppet::Acceptance::I18nDemoUtils
 
   language = 'ja_JP'
-  step "configure server locale to #{language}" do
-    configure_master_system_locale(language)
-  end
+  disable_i18n_default_master = master.puppet['disable_i18n']
 
   step 'enable i18n on master' do
     on(master, puppet("config set disable_i18n false"))
   end
 
+  step "configure server locale to #{language}" do
+    configure_master_system_locale(language)
+  end
+
   tmp_environment = mk_tmp_environment_with_teardown(master, File.basename(__FILE__, '.*'))
 
   step 'install a i18ndemo module' do
@@ -30,6 +32,7 @@
 
   teardown do
     step 'resetting the server locale' do
+      on(master, puppet("config set disable_i18n #{ disable_i18n_default_master }"))
       reset_master_system_locale
     end
     step 'uninstall the module' do
@@ -48,8 +51,10 @@
     shell_env_language = { 'LANGUAGE' => agent_language, 'LANG' => agent_language }
 
     type_path = agent.tmpdir('provider')
+    disable_i18n_default_agent = agent.puppet['disable_i18n']
     teardown do
-      on(agent, "rm -rf '#{type_path}'")
+      on(agent, puppet("config set disable_i18n #{ disable_i18n_default_agent }"))
+      agent.rm_rf(type_path)
     end
 
     step 'enable i18n' do

acceptance/tests/i18n/modules/puppet_agent_with_multiple_environments.rb

@@ -1,7 +1,7 @@
 test_name 'C100575: puppet agent with different modules in different environments should translate based on their module' do
   confine :except, :platform => /^solaris/ # translation not supported
 
-  tag 'audit:high',
+  tag 'audit:medium',
       'audit:acceptance'
 
   require 'puppet/acceptance/environment_utils.rb'
@@ -23,6 +23,7 @@
   full_path_env_2 = File.join('/tmp', tmp_environment_2)
   tmp_po_file = master.tmpfile('tmp_po_file')
 
+  disable_i18n_default_master = master.puppet['disable_i18n']
   step 'enable i18n on master' do
     on(master, puppet("config set disable_i18n false"))
   end
@@ -45,6 +46,7 @@
       uninstall_i18n_demo_module(master)
     end
     step 'resetting the server locale' do
+      on(master, puppet("config set disable_i18n #{ disable_i18n_default_master }"))
       reset_master_system_locale
     end
   end
@@ -56,6 +58,11 @@
     skip_test("test machine is missing #{agent_language} locale. Skipping") if agent_language.nil?
     shell_env_language = { 'LANGUAGE' => agent_language, 'LANG' => agent_language }
 
+    disable_i18n_default_agent = agent.puppet['disable_i18n']
+    teardown do
+      on(agent, puppet("config set disable_i18n #{ disable_i18n_default_agent }"))
+    end
+
     step 'enable i18n' do
       on(agent, puppet("config set disable_i18n false"))
     end

acceptance/tests/i18n/modules/puppet_apply.rb

@@ -1,7 +1,7 @@
 test_name 'C100567: puppet apply of module should translate messages' do
   confine :except, :platform => /^solaris/ # translation not supported
 
-  tag 'audit:high',
+  tag 'audit:medium',
       'audit:acceptance'
 
   require 'puppet/acceptance/temp_file_utils'
@@ -35,15 +35,17 @@
       install_i18n_demo_module(agent)
     end
 
-    step 'enable i18n' do
-      on(agent, puppet("config set disable_i18n false"))
-    end
-
+    disable_i18n_default_agent = agent.puppet['disable_i18n']
     teardown do
+      on(agent, puppet("config set disable_i18n #{ disable_i18n_default_agent }"))
       uninstall_i18n_demo_module(agent)
       on(agent, "rm -rf '#{type_path}'")
     end
 
+    step 'enable i18n' do
+      on(agent, puppet("config set disable_i18n false"))
+    end
+
     step "Run puppet apply of a module with language #{agent_language} and verify the translations" do
       step 'verify custom fact translations' do
         on(agent, puppet("apply -e \"class { 'i18ndemo': filename => '#{type_path}' }\"", 'ENV' => shell_env_language)) do |apply_result|

acceptance/tests/i18n/modules/puppet_apply_module_lang.rb

@@ -2,7 +2,7 @@
 
   confine :except, :platform => /^windows/ # Can't print Finish on an English or Japanese code page
 
-  tag 'audit:high',
+  tag 'audit:medium',
       'audit:acceptance'
 
   require 'puppet/acceptance/temp_file_utils'
@@ -29,20 +29,22 @@
     skip_test("test machine is missing #{agent_language} locale. Skipping") if agent_language.nil?
     shell_env_language = { 'LANGUAGE' => agent_language, 'LANG' => agent_language }
 
+    type_path = agent.tmpdir('provider')
+    disable_i18n_default_agent = agent.puppet['disable_i18n']
+    teardown do
+      on(agent, puppet("config set disable_i18n #{ disable_i18n_default_agent }"))
+      uninstall_i18n_demo_module(agent)
+      on(agent, "rm -rf '#{type_path}'")
+    end
+
     step 'install a i18ndemo module' do
       install_i18n_demo_module(agent)
     end
-    type_path = agent.tmpdir('provider')
 
     step 'enable i18n' do
       on(agent, puppet("config set disable_i18n false"))
     end
 
-    teardown do
-      uninstall_i18n_demo_module(agent)
-      on(agent, "rm -rf '#{type_path}'")
-    end
-
     step "Run puppet apply of a module with language #{agent_language} and verify default english returned" do
       step 'verify custom fact message translated and applied catalog message not translatated' do
         on(agent, puppet("apply -e \"class { 'i18ndemo': filename => '#{type_path}' }\"", 'ENV' => shell_env_language)) do |apply_result|

acceptance/tests/i18n/modules/puppet_apply_unsupported_lang.rb

@@ -21,16 +21,22 @@
       next
     end
 
-    step 'install a i18ndemo module' do
-      install_i18n_demo_module(agent)
-    end
     type_path = agent.tmpdir('provider')
-
+    disable_i18n_default_agent = agent.puppet['disable_i18n']
     teardown do
+      on(agent, puppet("config set disable_i18n #{ disable_i18n_default_agent }"))
       uninstall_i18n_demo_module(agent)
       on(agent, "rm -rf '#{type_path}'")
     end
 
+    step 'enable i18n' do
+      on(agent, puppet("config set disable_i18n false"))
+    end
+
+    step 'install a i18ndemo module' do
+      install_i18n_demo_module(agent)
+    end
+
     step "Run puppet apply of a module with language #{unsupported_language} and verify default english returned" do
       step 'verify custom fact messages not translatated' do
         on(agent, puppet("apply -e \"class { 'i18ndemo': filename => '#{type_path}' }\"", 'ENV' => shell_env_language)) do |apply_result|

acceptance/tests/i18n/modules/puppet_describe.rb

@@ -1,7 +1,7 @@
 test_name 'C100576: puppet describe with module type translates message' do
   confine :except, :platform => /^solaris/ # translation not supported
 
-  tag 'audit:high',
+  tag 'audit:medium',
       'audit:acceptance'
 
   require 'puppet/acceptance/i18n_utils'
@@ -27,6 +27,12 @@
     skip_test("test machine is missing #{agent_language} locale. Skipping") if agent_language.nil?
     shell_env_language = { 'LANGUAGE' => agent_language, 'LANG' => agent_language }
 
+    disable_i18n_default_agent = agent.puppet['disable_i18n']
+    teardown do
+      on(agent, puppet("config set disable_i18n #{ disable_i18n_default_agent }"))
+      uninstall_i18n_demo_module(agent)
+    end
+
     step 'enable i18n' do
       on(agent, puppet("config set disable_i18n false"))
     end
@@ -35,10 +41,6 @@
       install_i18n_demo_module(agent)
     end
 
-    teardown do
-      uninstall_i18n_demo_module(agent)
-    end
-
     step "Run puppet describe from a module with language #{agent_language} and verify the translations" do
       on(agent, puppet('describe i18ndemo_type', 'ENV' => shell_env_language)) do |result|
         assert_match(/\w+-i18ndemo type: dirパラメータは、検査するディレクトリパスをとります/, result.stdout, 'missing translation of dir parameter from i18ndemo_type')

acceptance/tests/i18n/modules/puppet_face.rb

@@ -1,7 +1,7 @@
 test_name 'C100573: puppet application/face with module translates messages' do
   confine :except, :platform => /^solaris/ # translation not supported
 
-  tag 'audit:high',
+  tag 'audit:medium',
       'audit:acceptance'
 
   require 'puppet/acceptance/i18n_utils'
@@ -27,14 +27,20 @@
     skip_test("test machine is missing #{agent_language} locale. Skipping") if agent_language.nil?
     shell_env_language = { 'LANGUAGE' => agent_language, 'LANG' => agent_language }
 
-    step 'install a i18ndemo module' do
-      install_i18n_demo_module(agent)
-    end
-
+    disable_i18n_default_agent = agent.puppet['disable_i18n']
     teardown do
+      on(agent, puppet("config set disable_i18n #{ disable_i18n_default_agent }"))
       uninstall_i18n_demo_module(agent)
     end
 
+    step 'enable i18n' do
+      on(agent, puppet("config set disable_i18n false"))
+    end
+
+    step 'install a i18ndemo module' do
+      install_i18n_demo_module(agent)
+    end
+
     step "Run puppet i18ndemo (face/application from a module with language #{agent_language} and verify the translations" do
       step 'puppet --help contains i18ndemo summary translation' do
         on(agent, puppet('--help', 'ENV' => shell_env_language)) do |result|

acceptance/tests/i18n/modules/puppet_resource.rb

@@ -1,7 +1,7 @@
 test_name 'C100572: puppet resource with module translates messages' do
   confine :except, :platform => /^solaris/ # translation not supported
 
-  tag 'audit:high',
+  tag 'audit:medium',
       'audit:acceptance'
 
   require 'puppet/acceptance/i18n_utils'
@@ -27,14 +27,20 @@
     skip_test("test machine is missing #{agent_language} locale. Skipping") if agent_language.nil?
     shell_env_language = { 'LANGUAGE' => agent_language, 'LANG' => agent_language }
 
-    step 'install a i18ndemo module' do
-      install_i18n_demo_module(agent)
-    end
-
+    disable_i18n_default_agent = agent.puppet['disable_i18n']
     teardown do
+      on(agent, puppet("config set disable_i18n #{ disable_i18n_default_agent }"))
       uninstall_i18n_demo_module(agent)
     end
 
+    step 'enable i18n' do
+      on(agent, puppet("config set disable_i18n false"))
+    end
+
+    step 'install a i18ndemo module' do
+      install_i18n_demo_module(agent)
+    end
+
     step "Run puppet resource for a module with language #{agent_language} and verify the translations" do
       step 'puppet resource i18ndemo_type information contains translation' do
         on(agent, puppet('resource i18ndemo_type', 'ENV' => shell_env_language), :acceptable_exit_codes => 1) do |result|