simp-beaker-helpers 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72ec3c87384ec91370fa23c4ad597d05d9244ea1489cdbbd0309ad056837fd64
-  data.tar.gz: fb2aec92e7da3523555fd5271c74eaa03c1980192bce56f4db8d814ff1e8b99c
+  metadata.gz: f08b36ddb74853e6b412100826f8ff3861bc9167a7fefb19846242adc0c8cb9a
+  data.tar.gz: 410c4055452b3fd33bb9f3fdc3182e7b4eff62a6c952db740957c244b40265c0
 SHA512:
-  metadata.gz: be4a71d244439e6a42eb65482faadc33dd66fb3e23f5dbbf71d81e57b8571fb4fb268292abdeac113a619deda38a7efb22a2ad9270869ca2fff3f4dcd2d2ef92
-  data.tar.gz: 44e06c866ba8ebb50bc730ce389de25c2f64aecca213a18a88df55aa1b60f67aa320c427e3d140078c3d41ce221a901a30a987d734c8a3da4f81c30652fc1e8c
+  metadata.gz: 6057883981b6554084ede31a5a718651fceedaee87a4bfc94f5c6e77c3580cbf4e5bb2f5da5ffb9831cbc5d3fe143849de6dab9ec5278e7352e27dd9148f12a6
+  data.tar.gz: c9cf815d91e0c3e750bdc4046c160ec7fb492181accf2f95230f15b29dd123b0f79eff396b8e694c9e1bc47360bd82e099da9cd72992beebebb24e6f3f6d1616

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.12.1 / 2018-10-24
+* Fall back to SSH file copies automatically when rsync does not work due to
+  test cases that affect ssh directly and that will cause new sessions to fail.
+
 ### 1.12.0 / 2018-10-22
 * When using suites, allow users to loop through multiple specified nodesets as
   a colon delimited list or loop through all nodesets by passing 'ALL'.

data/lib/simp/beaker_helpers.rb

@@ -68,7 +68,16 @@ module Simp::BeakerHelpers
 
       # End rsync hackery
 
-      rsync_to(sut, src, dest, _opts)
+      begin
+        rsync_to(sut, src, dest, _opts)
+      rescue
+        # Depending on what is getting tested, a new SSH session might not
+        # work. In this case, we fall back to SSH.
+        #
+        # The rsync failure is quite fast so this doesn't affect performance as
+        # much as shoving a bunch of data over the ssh session.
+        scp_to(sut, src, dest, opts)
+      end
     else
       scp_to(sut, src, dest, opts)
     end

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.12.0'
+  VERSION = '1.12.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Chris Tessmer