pdqtest 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d8bf6717a22891ee4b7d7a57436357135f21c2c
-  data.tar.gz: a89f67be7be4450c0af8c632020a0ef42f11a84f
+  metadata.gz: 4b859b1e69e60d862ea7bad7f5e163f09babeb03
+  data.tar.gz: 06eae870f12823b5bc51a14163c52229654de764
 SHA512:
-  metadata.gz: 3f2e86d6b37464f7690d1cbd19e5a34818dd9bbd4bd36a10bc7cf2629bd0c2d52cdea93e3dc24d8d87c710e77b7f733e0cf9c440cf45c2dc19be9d5024192cb6
-  data.tar.gz: f17400d1bc19650bae85ca29cb2bca977a528f78a6b7d8965b38256a6eb2dbfd23d565736c975790558638d3f446f350a72c9f1e1347204105bd357a271c1e29
+  metadata.gz: cea2599e6d6c22b56a7fd0285904618d448de6c195c2bedf1c721a157c19b5b21258fcfb1b8604be4bc00ccbff589d8293da4356390667070b71c7aa445844de
+  data.tar.gz: 893d79733f89deef23dbe53bc6b5bcce2ea9108536b0da082561ec6f8f43ac803a5733aeb0ea7a735c054744cbcd4b90cc08d2d4e81f2c16037ff5323727d2e5

data/exe/pdqtest

@@ -44,9 +44,18 @@ Escort::App.create do |app|
 
 
   app.command :acceptance do |command|
+    command.options do |opts|
+      opts.opt(:example,
+        'Run only this example (eg --example examples/init.pp)',
+        :long     => '--example',
+        :type     => :string,
+        :default  => nil,
+      )
+    end
     command.action do |options, arguments|
       PDQTest::Instance.set_keep_container(options[:global][:options][:keep_container])
-      PDQTest::core.run(lambda {PDQTest::Instance.run})
+      example = options[:global][:commands][:acceptance][:options][:example]
+      PDQTest::Core.run(lambda {PDQTest::Instance.run(example)})
     end
   end
 

data/lib/pdqtest/docker.rb

@@ -1,7 +1,7 @@
 module PDQTest
   module Docker
-    STDOUT = 0
-    STDERR = 1
+    OUT = 0
+    ERR = 1
     STATUS = 2
     ENV='export TERM=xterm LC_ALL=C PATH=/usr/local/bats/bin:/opt/puppetlabs/puppet/bin:$PATH;'
     IMAGE_NAME='geoffwilliams/pdqtest-centos:2017-01-08-0'
@@ -41,5 +41,30 @@ module PDQTest
       end
       status = allowable_values.include?(res[STATUS])
     end
+
+    def self.exec_out(res)
+      res[OUT]
+    end
+
+    def self.exec_err(res)
+      res[ERR]
+    end
+
+    def self.log_out(res)
+      exec_out(res).each { |l|
+        # Output comes back as an array and needs to be iterated or we lose our
+        # ansi formatting
+        Escort::Logger.output.puts l
+      }
+    end
+
+    def self.log_err(res)
+      exec_err(res).each { |l|
+        # Output comes back as an array and needs to be iterated or we lose our
+        # ansi formatting
+        Escort::Logger.error.error l
+      }
+    end
+
   end
 end

data/lib/pdqtest/instance.rb

@@ -21,14 +21,14 @@ module PDQTest
       @@keep_container = keep_container
     end
 
-    def self.run
+    def self.run(example=nil)
       # needed to prevent timeouts from container.exec()
       Excon.defaults[:write_timeout] = 1000
       Excon.defaults[:read_timeout] = 1000
 
       @@active_container = PDQTest::Docker::new_container(TEST_DIR)
       Escort::Logger.output.puts "alive, running tests"
-      status = PDQTest::Puppet.run(@@active_container)
+      status = PDQTest::Puppet.run(@@active_container, example)
 
       if @@keep_container
         Escort::Logger.output.puts "finished build, container #{@@active_container.id} left on system"

data/lib/pdqtest/puppet.rb

@@ -66,6 +66,7 @@ module PDQTest
     def self.test_basename(t)
       # remove examples/ and .pp
       # eg ./examples/apache/mod/mod_php.pp --> apache/mod/mod_php
+
       t.gsub(EXAMPLES_DIR + '/','').gsub('.pp','')
     end
 
@@ -75,7 +76,7 @@ module PDQTest
         Escort::Logger.output.puts "*** bats test **** bats #{PDQTest::Instance::TEST_DIR}/#{testcase}"
         res = PDQTest::Docker.exec(container, "bats #{PDQTest::Instance::TEST_DIR}/#{testcase}")
         status = PDQTest::Docker.exec_status(res)
-        Escort::Logger.output.puts res
+        PDQTest::Docker.log_out(res)
         @@bats_executed << testcase
       else
         Escort::Logger.error.error "no #{suffix} tests for #{example} (should be at #{testcase})"
@@ -92,6 +93,8 @@ module PDQTest
         script = File.read(setup)
         res = PDQTest::Docker.exec(container, script)
         status = PDQTest::Docker.exec_status(res)
+        PDQTest::Docker.log_out(res)
+
         @@setup_executed << setup
       else
         Escort::Logger.output.puts "no setup file for #{example} (should be in #{setup})"
@@ -101,7 +104,49 @@ module PDQTest
       status
     end
 
-    def self.run(container)
+    def self.run_example(container, example)
+      if ! example.start_with?('./')
+        # must prepend ./ to the example or we will not match the correct regexp
+        # in test_basename
+        example = "./#{example}"
+      end
+      Escort::Logger.output.puts "testing #{example}"
+      status = false
+
+      if setup_test(container, example)
+
+        # see if we should run a bats test before running puppet
+        if bats_test(container, example, BEFORE_SUFFIX)
+
+          # run puppet apply - 1st run
+          res = PDQTest::Docker.exec(container, puppet_apply(example))
+          PDQTest::Docker.log_out(res)
+          if PDQTest::Docker.exec_status(res, true) # allow 2 as exit status
+
+            # run puppet apply - 2nd run (check for idempotencey/no more changes)
+            res = PDQTest::Docker.exec(container, puppet_apply(example))
+            PDQTest::Docker.log_out(res)
+
+            # run the bats test if nothing failed yet
+            if PDQTest::Docker.exec_status(res) # only allow 0 as exit status
+              status = bats_test(container, example, AFTER_SUFFIX)
+            else
+              Escort::Logger.error.error "Not idempotent: #{example}"
+            end
+          else
+            Escort::Logger.error.error "First puppet run of #{example} failed"
+          end
+        else
+          Escort::Logger.error.error "Bats tests to run before #{example} failed"
+        end
+      else
+        Escort::Logger.error.error "Setup script for #{example} failed"
+      end
+
+      status
+    end
+
+    def self.run(container, example=nil)
       status = true
       Escort::Logger.output.puts "fetch deps"
       res = PDQTest::Docker.exec(container, install_deps)
@@ -111,23 +156,27 @@ module PDQTest
       res = PDQTest::Docker.exec(container, link_module)
       status &= PDQTest::Docker.exec_status(res)
       Escort::Logger.output.puts "run tests"
-      find_examples.each { |e|
-        Escort::Logger.output.puts "testing #{e} #{status}"
-
-        status &= setup_test(container, e)
-
-        # see if we should run a bats test before running puppet
-        status &= bats_test(container, e, BEFORE_SUFFIX)
-
-        # run puppet apply
-        res = PDQTest::Docker.exec(container, puppet_apply(e))
-        status &= PDQTest::Docker.exec_status(res, true)
-        Escort::Logger.output.puts res
-
-        # see if we should run a bats test after running puppet
-        status &= bats_test(container, e, AFTER_SUFFIX)
-      }
-
+      if example
+        status &= run_example(container, example)
+      else
+        find_examples.each { |e|
+          status &= run_example(container, e)
+          # Escort::Logger.output.puts "testing #{e} #{status}"
+          #
+          # status &= setup_test(container, e)
+          #
+          # # see if we should run a bats test before running puppet
+          # status &= bats_test(container, e, BEFORE_SUFFIX)
+          #
+          # # run puppet apply
+          # res = PDQTest::Docker.exec(container, puppet_apply(e))
+          # status &= PDQTest::Docker.exec_status(res, true)
+          # Escort::Logger.output.puts res
+          #
+          # # see if we should run a bats test after running puppet
+          # status &= bats_test(container, e, AFTER_SUFFIX)
+        }
+      end
       status
     end
 

data/lib/pdqtest/version.rb

@@ -1,3 +1,3 @@
 module PDQTest
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Geoff Williams