testbeat 0.5.4 → 0.6.0.pr5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36374897cf2bdbf0928f6a8f49e86b1086df49b1
-  data.tar.gz: 5830db301c4892e5bbdc9d4631ddc3a3fba63c7d
+  metadata.gz: 1c4cb916fcd70443a5c039e2ac825361ec40bda5
+  data.tar.gz: 063cdc94d635898c6432449ce66b1e7fa3869442
 SHA512:
-  metadata.gz: c22f32ecc7ad20e78f6cd361daecb0167404400599620d3eb532f67eac2e1c1eacda59f775cc78fe7573e25c6a36924544dc5830bb95a310a23dd6399d9032a6
-  data.tar.gz: 08e0594fb5f3b50b2e0568886865be063203a97f1ebc878b9229ddbe23f5a6bd3321f243479af3e56f78534d330ac315b33e170aac2ddd05222e8c2bb16f8de9
+  metadata.gz: 60fd118265277b0c8cfbecc9adedd7ff55981ba4e8c2ac8abf1497e2cbe32f05eb2764eeb5a2f9ddf6ff03405e0c219ad7ac965ea3624b5b8611803157c8f703
+  data.tar.gz: 8748f890402061da90bcc0d6fed766d45b6e45537ec591d9e45fda10298f2e0d74535fa98db84652c49d88e97d1cdbb1459d5a52482429eab25bbc5086f77409

data/lib/vagrant/noderunner.rb

@@ -7,6 +7,15 @@ require_relative './cookbook_decompiler.rb'
 # dependencies for the lib running node tests, preferrably discovered here instead of in node loop
 require 'rspec'
 require 'set'
+require 'open3'
+
+def get_hostname(node: $node, vagrant_dir: $vagrant_dir)
+  [node, vagrant_dir]
+  cmd_hostname = "cat /etc/hostname"
+  hostname = Open3.popen3("cd #{ vagrant_dir + node }; vagrant ssh -c \"#{cmd_hostname}\"") { |stdin, stdout, stderr, wait_thr| stdout.read }
+  puts "Vagrant node hostname: #{hostname}"
+  return hostname
+end
 
 # Get first matching subgroup
 #  stripped of quotes and leading/trailing whitespace
@@ -101,10 +110,11 @@ def run_rspec(node, path, outf, verbose)
   return $?.success?
 end
 
-def run_tests(recipes, out: "#{$vagrant_dir}#{$node}/generated/", testglob: "test/acceptance/*.rb", verbose: true)
-  [recipes, out, testglob, verbose]
+def run_tests(recipes, hostname, out: "#{$vagrant_dir}#{$node}/generated/", testglob: "test/acceptance/*.rb", verbose: true)
+  [recipes, hostname, out, testglob, verbose]
   rspec_ok = true # if no tests => no failure
 
+  puts "Starting test run for hostname: #{hostname}"
   if Dir.exists?(out)
     puts "Using existing output directory #{out}"
     Dir.glob("#{out}acceptance*").each do |previous|
@@ -128,14 +138,14 @@ def run_tests(recipes, out: "#{$vagrant_dir}#{$node}/generated/", testglob: "tes
       if not run_history.include?(path_to_file)
         run_history.add(path_to_file)
         just_filename = path_to_file.split("/")[-1]
-        rspec_ok = run_rspec($node, path_to_file, "#{out}acceptance_#{cookbook_name}_#{just_filename}", verbose) && rspec_ok
+        rspec_ok = run_rspec(hostname, path_to_file, "#{out}acceptance_#{cookbook_name}_#{just_filename}", verbose) && rspec_ok
       end
     end
   end
 
   path_to_node_acceptance_tests = "#{$vagrant_dir}#{$node}/acceptance"
   if Dir.exists?(path_to_node_acceptance_tests)
-    rspec_ok = run_rspec($node, "#{path_to_node_acceptance_tests}/*.rb", "#{out}acceptance_node", verbose) && rspec_ok
+    rspec_ok = run_rspec(hostname, "#{path_to_node_acceptance_tests}/*.rb", "#{out}acceptance_node", verbose) && rspec_ok
   else
     puts "No node-specific acceptance tests available for #{$node} in #{path_to_node_acceptance_tests}"
   end
@@ -196,6 +206,7 @@ def main(node: "labs01", provider: "virtualbox", retest: false, guestint: true,
     vagrant_cmd = cwd_to_node + "vagrant up --provider=#{provider}"
   elsif /running/.match(v_status)
     # Add "if runlist file older than 1 h, assume force_long"
+    hostname = get_hostname()
     if retest and File.exists?(runlist_file)
       old_run = File.read(runlist_file)
       #run_match = /Run List expands to \[(.*?)\]/.match(old_run)
@@ -209,7 +220,7 @@ def main(node: "labs01", provider: "virtualbox", retest: false, guestint: true,
       if guestint
         rspec_ok = rspec_ok && run_integration_tests(all_cookbooks)
       end
-      rspec_ok = rspec_ok && run_tests(all_cookbooks)
+      rspec_ok = rspec_ok && run_tests(all_cookbooks, hostname)
       if not rspec_ok
         puts "There were test failures!"
         exit 1
@@ -261,6 +272,8 @@ def main(node: "labs01", provider: "virtualbox", retest: false, guestint: true,
     exit 1
   else
     puts "Vagrant provision completed."
+    hostname = get_hostname()
+
     # Run List expands to [repos-channel::haproxy, cms-base::folderstructure, repos-apache2, repos-subversion, repos-rweb, repos-trac, repos-liveserver, repos-indexing, repos-snapshot, repos-vagrant-labs]
     run_match = /Run List expands to \[(.*?)\]/.match(vagrant_run_output)
     if run_match
@@ -278,7 +291,7 @@ def main(node: "labs01", provider: "virtualbox", retest: false, guestint: true,
       if guestint
         rspec_ok = rspec_ok && run_integration_tests(all_cookbooks)
       end
-      rspec_ok = rspec_ok && run_tests(all_cookbooks)
+      rspec_ok = rspec_ok && run_tests(all_cookbooks, hostname)
       if not rspec_ok
         exit 1
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testbeat
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0.pr5
 platform: ruby
 authors:
 - Staffan Olsson
@@ -78,12 +78,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: REST acceptance testing framework