pdqtest 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95fb5fc14bbce484b01b0527d3b9b7fadf4d3fc0
-  data.tar.gz: 7086b24ca80b133ecda24ce58d6e2b633ac70d57
+  metadata.gz: 59cfe8a4a7a28734f02acac84965152cb9e28197
+  data.tar.gz: 1b70cf001fc4a3b622990c0f128ff4a6099800e6
 SHA512:
-  metadata.gz: e40c39f1382f86100cd1e77f93a446d2512100ce6155e1305411319221c64f01f888cb147415e7de5a98a105c6e6616b1fde3bf2e1807c4ee593be7b05e69264
-  data.tar.gz: aa3faf0a0c0d74045d1df89e6fc50eafbf9f09176ab56fe2ede034bbceeb18653f2242dd2ae3e54b9dc04232c583d009ebe7ea4b7817be710d879fb3d4c71937
+  metadata.gz: 364b23efc25433b0cf82a4d4c4f3e1d91302f90daffad172cc462905254c5cab2626b0512a5940048b693cee7bdc199b18f37c56dd6e6d94d78151a79b7ed6ed
+  data.tar.gz: d0b0a259cfcbb34dc9f157405a1fbafb45f54e52b6465ac531006c64133a37384487b978a1258d59e46039ce4a9db79bc0c0fe0bbefd20fd3ef9c16ee79b9732

data/exe/pdqtest

@@ -49,6 +49,14 @@ Escort::App.create do |app|
       :type     => :boolean,
       :default  => false,
     )
+
+    opts.opt(:skip_idempotency,
+      'Dont check idempotency (run only once)',
+      :long     => '--skip-idempotency',
+      :type     => :boolean,
+      :default  => false,
+    )
+
   end
 
   app.command :all do |command|
@@ -56,6 +64,7 @@ Escort::App.create do |app|
     command.description "Run all tests"
     command.action do |options, arguments|
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
+      PDQTest::Puppet.skip_second_run(options[:global][:options][:skip_idempotency])
 
       PDQTest::Instance.set_keep_container(options[:global][:options][:keep_container])
       PDQTest::Instance.set_docker_image(options[:global][:options][:image_name])
@@ -92,6 +101,7 @@ Escort::App.create do |app|
     end
     command.action do |options, arguments|
       PDQTest::Emoji.disable(options[:global][:options][:disable_emoji])
+      PDQTest::Puppet.skip_second_run(options[:global][:options][:skip_idempotency])
       PDQTest::Instance.set_docker_image(options[:global][:options][:image_name])
       PDQTest::Instance.set_keep_container(options[:global][:options][:keep_container])
       example = options[:global][:commands][:acceptance][:options][:example]

data/lib/pdqtest/puppet.rb

@@ -20,8 +20,13 @@ module PDQTest
     CLASS_RE          = /^class /
     @@bats_executed   = []
     @@setup_executed  = []
+    @@skip_second_run = false
     FIXTURES          = 'fixtures.yml'
 
+    def self.skip_second_run(skip_second_run)
+      @@skip_second_run = skip_second_run
+    end
+
     def self.reset_bats_executed
       @@bats_executed = []
     end
@@ -212,15 +217,22 @@ module PDQTest
           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)
+            if @@skip_second_run
+              Escort::Logger.output.puts "Skipping idempotency check as you requested..."
 
-            # run the bats test if nothing failed yet
-            if PDQTest::Docker.exec_status(res) # only allow 0 as exit status
+              # check the system right now since puppet ran OK once
               status = bats_test(container, example, AFTER_SUFFIX)
             else
-              Escort::Logger.error.error "Not idempotent: #{example}"
+              # 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
             end
           else
             Escort::Logger.error.error "First puppet run of #{example} failed"

data/lib/pdqtest/version.rb

@@ -1,3 +1,3 @@
 module PDQTest
-  VERSION = "0.8.4"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pdqtest
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-24 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler