kitchen-salt 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a46966eced8d8a45e75f0aea932a70a6cd20e047
-  data.tar.gz: 36024fd5cd393cc06230d00324cd5d49e9197d6a
+  metadata.gz: f711ec1a9e53499fabcbcfd43f13987d9b38bcb5
+  data.tar.gz: 5ce22225b656097be617e2cafcca453b43463add
 SHA512:
-  metadata.gz: a5320882718483c44989b8a42c61cc9d7ba36ba82f4254fc117e52cbebe3d5965f5bd535a3fcd8dcc3559ff8520bf3d9d4a4671a3ada3d88f14af266b2a0006d
-  data.tar.gz: 4124bd733b736bec1d09c9df5ea9ae43c58532066514a2ddf4ffe4fe6dc7c844414f2530dc6fb35c298054b6152556b17511d50a3a4f582f9051370bcb67e20e
+  metadata.gz: 410f0585fe62b1fd6be86be74af64f1d1635712b18aab725eff66c112eafb9b16870fbc851f69e372daa44579ff93854ce5c6d4d7390632c43add517d3ef8568
+  data.tar.gz: 979dd2e1b87611a79c59c55d75b7eb6587ba2eed6e2617cac0c7c6d121649d0f09fbbffb4e6e4d164926e90c5505b6f94c35a595396f3db9a58e0c88d6cf63a3

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end

data/lib/kitchen/verifier/nox.rb

@@ -0,0 +1,140 @@
+# -*- encoding: utf-8 -*-
+
+require "kitchen/verifier/base"
+
+module Kitchen
+  module Verifier
+    class Nox < Kitchen::Verifier::Base
+      kitchen_verifier_api_version 1
+
+      plugin_version Kitchen::VERSION
+
+      default_config :testingdir, '/testing'
+      default_config :tests, []
+      default_config :transport, false
+      default_config :save, {}
+      default_config :windows, false
+      default_config :verbose, false
+      default_config :run_destructive, false
+      default_config :ssh_tests, true
+      default_config :proxy_tests, false
+      default_config :pytest, false
+      default_config :coverage, false
+      default_config :junitxml, false
+      default_config :from_filenames, []
+      default_config :enable_filenames, false
+      default_config :passthrough_opts, []
+      default_config :output_columns, 120
+      default_config :sysinfo, true
+
+      def call(state)
+        info("[#{name}] Verify on instance #{instance.name} with state=#{state}")
+        root_path = (config[:windows] ? '%TEMP%\\kitchen' : '/tmp/kitchen')
+        if ENV['KITCHEN_TESTS']
+          ENV['KITCHEN_TESTS'].split(' ').each{|test| config[:tests].push(test)}
+        end
+        noxenv = instance.suite.name
+        if config[:pytest]
+          noxenv = "pytest"
+          tests = config[:tests].join(' ')
+        else
+          noxenv = "runtests"
+          tests = config[:tests].collect{|test| "-n #{test}"}.join(' ')
+        end
+        noxenv = "#{noxenv}-#{config[:transport] ? config[:transport] : 'zeromq'}"
+        if ENV['NOX_SESSION']
+          noxenv = "#{noxenv}-#{ENV['NOX_SESSION']}"
+        end
+        # Nox env's are not py<python-version> named, they just use the <python-version>
+        # Additionally, nox envs are parametrised to enable or disable test coverage
+        # So, the line below becomes something like:
+        #   runtests-2(coverage=True)
+        #   pytest-3(coverage=False)
+        suite = instance.suite.name.gsub('py', '').gsub('2', '2.7')
+        noxenv = "#{noxenv}-#{suite}(coverage=#{config[:coverage] ? 'True' : 'False'})"
+
+        if config[:enable_filenames] and ENV['CHANGE_TARGET'] and ENV['BRANCH_NAME']
+          require 'git'
+          repo = Git.open(Dir.pwd)
+          config[:from_filenames] = repo.diff("origin/#{ENV['CHANGE_TARGET']}",
+                                              "origin/#{ENV['BRANCH_NAME']}").name_status.keys.select{|file| file.end_with?('.py')}
+        end
+
+        if config[:junitxml]
+          junitxml = File.join(root_path, config[:testingdir], 'artifacts', 'xml-unittests-output')
+          if config[:pytest]
+            junitxml = "--junitxml=#{File.join(junitxml, 'test-results.xml')}"
+          else
+            junitxml = "--xml=#{junitxml}"
+          end
+        end
+
+        # Be sure to copy the remote artifacts directory to the local machine
+        save = {
+          "#{File.join(root_path, config[:testingdir], 'artifacts')}" => "#{Dir.pwd}/"
+        }
+        # Hash insert order matters, that's why we define a new one and merge
+        # the one from config
+        save.merge!(config[:save])
+
+        command = [
+          'nox',
+          "-f #{File.join(root_path, config[:testingdir], 'noxfile.py')}",
+          (config[:windows] ? "-e #{noxenv}" : "-e '#{noxenv}'"),
+          '--',
+          "--output-columns=#{config[:output_columns]}",
+          (config[:sysinfo] ? '--sysinfo' : ''),
+          (config[:junitxml] ? junitxml : ''),
+          (config[:windows] ? "--names-file=#{root_path}\\testing\\tests\\whitelist.txt" : ''),
+          (config[:verbose] ? '-vv' : '-v'),
+          (config[:run_destructive] ? "--run-destructive" : ''),
+          (config[:ssh_tests] ? "--ssh-tests" : ''),
+          (config[:proxy_tests] ? "--proxy-tests" : ''),
+          config[:passthrough_opts].join(' '),
+          (config[:from_filenames].any? ? "--from-filenames=#{config[:from_filenames].join(',')}" : ''),
+          tests,
+        ].join(' ')
+        if config[:windows]
+          command = "cmd.exe /c --% \"#{command}\" 2>&1"
+        end
+        info("Running Command: #{command}")
+        instance.transport.connection(state) do |conn|
+          begin
+            if config[:windows]
+              conn.execute('$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")')
+              conn.execute("$env:PythonPath = [Environment]::ExpandEnvironmentVariables(\"#{root_path}\\testing\")")
+            else
+              begin
+                conn.execute(sudo("chown -R $USER #{root_path}"))
+              rescue => e
+                error("Failed to chown #{root_path} :: #{e}")
+              end
+            end
+            begin
+              conn.execute(sudo(command))
+            rescue => e
+              info("Verify command failed :: #{e}")
+            end
+          ensure
+            save.each do |remote, local|
+              unless config[:windows]
+                begin
+                  conn.execute(sudo("chmod -R +r #{remote}"))
+                rescue => e
+                  error("Failed to chown #{remote} :: #{e}")
+                end
+              end
+              begin
+                info("Copying #{remote} to #{local}")
+                conn.download(remote, local)
+              rescue => e
+                error("Failed to copy #{remote} to #{local} :: #{e}")
+              end
+            end
+          end
+        end
+        debug("[#{name}] Verify completed.")
+      end
+    end
+  end
+end

data/lib/kitchen/verifier/tox.rb

@@ -122,7 +122,7 @@ module Kitchen
                 info("Copying #{remote} to #{local}")
                 conn.download(remote, local)
               rescue => e
-                error("Failed to copy #{remote} to #{local} :: ${e}")
+                error("Failed to copy #{remote} to #{local} :: #{e}")
               end
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - SaltStack Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -28,14 +28,14 @@ dependencies:
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
@@ -158,6 +158,7 @@ files:
 - lib/kitchen/provisioner/salt_solo.rb
 - lib/kitchen/provisioner/spm.erb
 - lib/kitchen/transport/runtests.rb
+- lib/kitchen/verifier/nox.rb
 - lib/kitchen/verifier/runtests.rb
 - lib/kitchen/verifier/salttox.rb
 - lib/kitchen/verifier/tox.rb