beaker 2.3.0 → 2.4.0

data/lib/beaker/host/windows.rb

@@ -21,6 +21,8 @@ module Windows
         'group'         => 'Administrators',
         'puppetservice' => 'pe-httpd',
         'puppetpath'    => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+        'puppetconfdir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+        'puppetcodedir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
         'hieraconf'     => '`cygpath -smF 35`/Puppetlabs/puppet/etc/hiera.yaml',
         'puppetvardir'  => '`cygpath -smF 35`/PuppetLabs/puppet/var',
         'distmoduledir' => '`cygpath -smF 35`/PuppetLabs/puppet/etc/modules',
@@ -37,14 +39,16 @@ module Windows
         'user'              => 'Administrator',
         'group'             => 'Administrators',
         'puppetpath'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+        'puppetconfdir'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
+        'puppetcodedir'        => '`cygpath -smF 35`/PuppetLabs/puppet/etc',
         'hieraconf'         => '`cygpath -smF 35`/Puppetlabs/puppet/etc/hiera.yaml',
         'puppetvardir'      => '`cygpath -smF 35`/PuppetLabs/puppet/var',
         'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/puppet/etc/modules',
         'sitemoduledir'     => 'C:/usr/share/puppet/modules',
         'hieralibdir'       => '`cygpath -w /opt/puppet-git-repos/hiera/lib`',
         'hierapuppetlibdir' => '`cygpath -w /opt/puppet-git-repos/hiera-puppet/lib`',
-        #let's just add both potential bin dirs to the path
-        'puppetbindir'  => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
+        #let's just add both potential bin dirs to the path, include ruby too for `gem`, `ruby`, etc
+        'puppetbindir'  => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
         'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
         'pathseparator'     => ';',
       })

data/lib/beaker/host_prebuilt_steps.rb

@@ -517,6 +517,8 @@ module Beaker
           host.add_env_var(var, value)
         end
 
+        host.exec(Command.new("cat #{host[:ssh_env_file]}"))
+
         #close the host to re-establish the connection with the new sshd settings
         host.close
       end

data/lib/beaker/hypervisor.rb

@@ -46,6 +46,8 @@ module Beaker
           Beaker::VagrantFusion
         when /^vagrant_workstation$/
           Beaker::VagrantWorkstation
+        when /^vagrant_parallels$/
+          Beaker::VagrantParallels
         when /^google$/
           Beaker::GoogleCompute
         when /^docker$/
@@ -127,6 +129,6 @@ module Beaker
   end
 end
 
-[ 'vsphere_helper', 'vagrant', 'vagrant_virtualbox', 'vagrant_libvirt', 'vagrant_fusion', 'vagrant_workstation', 'fusion', 'aws_sdk', 'vsphere', 'vcloud', 'vcloud_pooled', 'aixer', 'solaris', 'docker', 'google_compute', 'openstack' ].each do |lib|
+[ 'vsphere_helper', 'vagrant', 'vagrant_virtualbox', 'vagrant_parallels', 'vagrant_libvirt', 'vagrant_fusion', 'vagrant_workstation', 'fusion', 'aws_sdk', 'vsphere', 'vcloud', 'vcloud_pooled', 'aixer', 'solaris', 'docker', 'google_compute', 'openstack' ].each do |lib|
     require "beaker/hypervisor/#{lib}"
 end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -452,7 +452,12 @@ module Beaker
     # @api private
     def set_hostnames
       @hosts.each do |host|
-        host.exec(Command.new("hostname #{host.name}"))
+        if host['platform'] =~ /el-7/
+          # on el-7 hosts, the hostname command doesn't "stick" randomly
+          host.exec(Command.new("hostnamectl set-hostname #{host.name}"))
+        else
+          host.exec(Command.new("hostname #{host.name}"))
+        end
       end
     end
 

data/lib/beaker/hypervisor/docker.rb

@@ -11,7 +11,12 @@ module Beaker
       ::Docker.options = { :write_timeout => 300, :read_timeout => 300 }.merge(::Docker.options || {})
       # assert that the docker-api gem can talk to your docker
       # enpoint.  Will raise if there is a version mismatch
-      ::Docker.validate_version!
+      begin
+        ::Docker.validate_version!
+      rescue Excon::Errors::SocketError => e
+        raise "Docker instance not found.\nif you are on OSX, you might not have Boot2Docker setup correctly\nCheck your DOCKER_HOST variable has been set"
+      end
+
       # Pass on all the logging from docker-api to the beaker logger instance
       ::Docker.logger = @logger
     end

data/lib/beaker/hypervisor/vagrant.rb

@@ -37,7 +37,7 @@ module Beaker
         if /windows/i.match(host['platform'])
           v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389\n"
           v_file << "    v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true\n"
-          v_file << "    v.vm.guest = :windows"
+          v_file << "    v.vm.guest = :windows\n"
         end
 
         if /osx/i.match(host['platform'])

data/lib/beaker/hypervisor/vagrant_parallels.rb

@@ -0,0 +1,18 @@
+require 'beaker/hypervisor/vagrant'
+
+class Beaker::VagrantParallels < Beaker::Vagrant
+    def provision(provider = 'parallels')
+        super
+    end
+
+    def self.provider_vfile_section(host, options)
+        provider_section  = ""
+        provider_section << "    v.vm.provider :parallels do |prl|\n"
+        provider_section << "      prl.optimize_power_consumption = false\n"
+        provider_section << "      prl.memory = '#{options['vagrant_memsize'] ||= '1024'}'\n"
+        provider_section << "      prl.update_guest_tools = false\n" if options[:prl_update_guest_tools] == 'disable'
+        provider_section << "    end\n"
+
+        provider_section
+    end
+end

data/lib/beaker/logger.rb

@@ -257,7 +257,7 @@ module Beaker
     # @return [Array<String>] An array of strings that do not have color codes
     def strip_colors_from lines
       Array( lines ).map do |line|
-        convert(line).gsub(/(\e|\^\[)\[(\d*;)*\d*m/, '')
+        Logger.strip_color_codes(convert(line))
       end
     end
 
@@ -312,6 +312,13 @@ module Beaker
       log_dir
     end
 
+    #Remove color codes from provided string.  Color codes are of the format /(\e\[\d\d;\d\dm)+/.
+    #@param [String] text The string to remove color codes from
+    #@return [String] The text without color codes
+    def Logger.strip_color_codes(text)
+      text.gsub(/(\e|\^\[)\[(\d*;)*\d*m/, '')
+    end
+
     private
     # Expand each symlink found to its full path
     # Lines are assumed to be in the format "String : Integer"

data/lib/beaker/logger_junit.rb

@@ -0,0 +1,157 @@
+module Beaker
+  # The Beaker JUnit Logger class
+  # This module handles message reporting from Beaker to the JUnit format
+  #
+  # There is a specific pattern for using this class.
+  # Here's a list of example usages:
+  # - {Beaker::TestSuite::TestSuiteResult#write_junit_xml}
+  module LoggerJunit
+
+    # writes the xml created in the block to the xml file given
+    #
+    # Note: Error Recovery should take place in the caller of this
+    # method in order to recover gracefully
+    #
+    # @param [String] xml_file Path to the xml file
+    # @param [String] stylesheet Path to the stylesheet file
+    # @param [Proc]   block XML message construction block
+    #
+    # @return nil
+    def self.write_xml(xml_file, stylesheet, &block)
+      doc, suites = self.get_xml_contents(xml_file, name, stylesheet)
+
+      if block_given?
+        case block.arity
+        when 2
+          yield doc, suites
+        else
+          raise ArgumentError.new "write_xml block takes 2 arguments, not #{block.arity}"
+        end
+      end
+
+      self.finish(doc, xml_file)
+    end
+
+    # writes out xml content for a doc
+    #
+    # @param [Nokogiri::XML] doc Nokogiri doc containing content to write
+    # @param [String] xml_file Path to the xml file to write
+    #
+    # @return nil
+    def self.finish(doc, xml_file)
+      # junit/name.xml will be created in a directory relative to the CWD
+      # --  JLS 2/12
+      File.open(xml_file, 'w') { |fh| fh.write(doc.to_xml) }
+    end
+
+    # gets the xml doc & suites in order to build your xml output on top of
+    #
+    # @param [String] xml_file Path to the xml file
+    # @param [String] name Name of the testsuite you're writing
+    # @param [String] stylesheet Path to the stylesheet file
+    #
+    # @return [Nokogiri::XML] doc to use for your xml content
+    # @return [Nokogiri::XML::Node] suites to add your content to
+    def self.get_xml_contents(xml_file, name, stylesheet)
+      self.copy_stylesheet_into_xml_dir(stylesheet, xml_file)
+      xml_file_already_exists = File.file?(xml_file)
+      doc = self.get_doc_for_filename(xml_file, stylesheet, xml_file_already_exists)
+      suites = self.get_testsuites_from_doc(doc, name, xml_file_already_exists)
+      return doc, suites
+    end
+
+    # copies given stylesheet into the directory of the xml file given
+    #
+    # @param [String] stylesheet Path to the stylesheet file
+    # @param [String] xml_file Path to the xml file
+    #
+    # @return nil
+    def self.copy_stylesheet_into_xml_dir(stylesheet, xml_file)
+      if not File.file?(File.join(File.dirname(xml_file), File.basename(stylesheet)))
+        FileUtils.copy(stylesheet, File.join(File.dirname(xml_file), File.basename(stylesheet)))
+      end
+    end
+
+    # sets up doc & gives us the suites for the testsuite named
+    #
+    # @param [Nokogiri::XML] doc Doc that you're getting suites from
+    # @param [String] name Testsuite node name
+    # @param [Boolean] already_existed Whether or not the doc already existed
+    #
+    # @return [Nokogiri::XML::Node] testsuites
+    def self.get_testsuites_from_doc(doc, name, already_existed)
+      #check to see if an output file already exists, if it does add or replace test suite data
+      if already_existed
+        suites = doc.at_xpath('testsuites')
+        #remove old data
+        doc.search("//testsuite").each do |node|
+          if node['name'] =~ /#{name}/
+            node.unlink
+          end
+        end
+      else
+        suites        = Nokogiri::XML::Node.new('testsuites', doc)
+        suites.parent = doc
+      end
+      return suites
+    end
+
+    # gives the document object for a particular file
+    #
+    # @param [String] filename Path to the file that you're opening
+    # @param [String] stylesheet Path to the stylesheet for this doc
+    # @param [Boolean] already_exists Whether or not the file already exists
+    #
+    # @return [Nokogiri::XML] Doc that you want to write in
+    def self.get_doc_for_filename(filename, stylesheet, already_exists)
+      if already_exists
+        doc           = Nokogiri::XML(File.open(filename, 'r'))
+      else
+        #no existing file, create a new one
+        doc           = Nokogiri::XML::Document.new()
+        doc.encoding  = 'UTF-8'
+        pi            = Nokogiri::XML::ProcessingInstruction.new(doc, "xml-stylesheet", "type=\"text/xsl\" href=\"#{File.basename(stylesheet)}\"")
+        pi.parent     = doc
+      end
+      return doc
+    end
+
+    # Remove color codes and invalid XML characters from provided string
+    # @param [String] string The string to format
+    # @return [String] the correctly formatted cdata
+    def self.format_cdata string
+      self.escape_invalid_xml_chars(Logger.strip_color_codes(string))
+    end
+
+    # Escape invalid XML UTF-8 codes from provided string, see http://www.w3.org/TR/xml/#charsets for valid
+    # character specification
+    # @param [String] string The string to remove invalid codes from
+    # @return [String] Properly escaped string
+    def self.escape_invalid_xml_chars string
+      escaped_string = ""
+      string.chars.each do |i|
+        char_as_codestring = i.unpack("U*").join
+        if self.is_valid_xml(char_as_codestring.to_i)
+          escaped_string << i
+        else
+          escaped_string << "\\#{char_as_codestring}"
+        end
+      end
+      escaped_string
+    end
+
+    # Determine if the provided number falls in the range of accepted xml unicode values
+    # See http://www.w3.org/TR/xml/#charsets for valid for valid character specifications.
+    # @param [Integer] int The number to check against
+    # @return [Boolean] True, if the number corresponds to a valid xml unicode character, otherwise false
+    def self.is_valid_xml(int)
+      return ( int == 0x9 or
+        int == 0xA or
+        ( int >= 0x0020 and int <= 0xD7FF ) or
+        ( int >= 0xE000 and int <= 0xFFFD ) or
+        ( int >= 0x100000 and int <= 0x10FFFF )
+      )
+    end
+
+  end
+end

data/lib/beaker/network_manager.rb

@@ -25,6 +25,11 @@ module Beaker
       @hosts = []
       @machines = {}
       @hypervisors = nil
+
+      @options[:timestamp]            = Time.now unless @options.has_key?(:timestamp)
+      @options[:xml_dated_dir]        = Beaker::Logger.generate_dated_log_folder(@options[:xml_dir], @options[:timestamp])
+      @options[:log_dated_dir]        = Beaker::Logger.generate_dated_log_folder(@options[:log_dir], @options[:timestamp])
+      @options[:logger_sut]  = Beaker::Logger.new(File.join(@options[:log_dated_dir], @options[:log_sut_event]), { :quiet => true })
     end
 
     #Provision all virtual machines.  Provision machines according to their set hypervisor, if no hypervisor
@@ -47,6 +52,9 @@ module Beaker
       @machines.each_key do |type|
         @hypervisors[type] = Beaker::Hypervisor.create(type, @machines[type], @options)
         @hosts << @machines[type]
+        @machines[type].each do |host|
+          log_sut_event host, true
+        end
       end
       @hosts = @hosts.flatten
       @hosts
@@ -91,10 +99,30 @@ module Beaker
       if @hypervisors
         @hypervisors.each_key do |type|
           @hypervisors[type].cleanup
+          @hypervisors[type].instance_variable_get(:@hosts).each do |host|
+            log_sut_event host, false
+          end
         end
       end
       @hypervisors = nil
     end
 
+    # logs provisioning events
+    #
+    # @param [Host] host The host that the event is happening to
+    # @param [Boolean] create Whether the event is creation or cleaning up
+    #
+    # @return [String] the log line created for this event
+    def log_sut_event host, create
+      raise ArgumentError.new "log_sut_event called before sut logger created. skipping #{host}, #{create}" unless @options.has_key?(:logger_sut)
+      sut_logger = @options[:logger_sut]
+      time = Time.new
+      stamp = time.strftime('%Y-%m-%d %H:%M:%S')
+      verb = create ? '+' : '-'
+      line = "#{stamp}\t[#{verb}]\t#{host['hypervisor']}\t#{host['platform']}\t#{host}"
+      sut_logger.notify line
+      line
+    end
+
   end
 end

data/lib/beaker/options/presets.rb

@@ -113,6 +113,10 @@ module Beaker
           :project                => 'Beaker',
           :department             => 'unknown',
           :created_by             => ENV['USER'] || ENV['USERNAME'] || 'unknown',
+          :openstack_api_key      => ENV['OS_PASSWORD'],
+          :openstack_username     => ENV['OS_USERNAME'],
+          :openstack_auth_url     => "#{ENV['OS_AUTH_URL']}/tokens",
+          :openstack_tenant       => ENV['OS_TENANT_NAME'],
           :jenkins_build_url      => nil,
           :validate               => true,
           :configure              => true,
@@ -131,6 +135,7 @@ module Beaker
           :xml_file               => 'beaker_junit.xml',
           :xml_stylesheet         => 'junit.xsl',
           :log_dir                => 'log',
+          :log_sut_event          => 'sut.log',
           :color                  => true,
           :dry_run                => false,
           :timeout                => 300,
@@ -182,6 +187,7 @@ module Beaker
                                      :q_rbac_database_user                          => 'RbhNBklm',
                                      :q_rbac_database_name                          => 'pe-rbac',
                                      :q_rbac_database_password                      => '~!@#$%^*-/ aZ',
+                                     :q_install_update_server                       => 'y',
           },
           :dot_fog                => File.join(ENV['HOME'], '.fog'),
           :ec2_yaml               => 'config/image_templates/ec2.yaml',

data/lib/beaker/test_suite.rb

@@ -148,156 +148,85 @@ module Beaker
         @logger.notify "  Test Case #{test_case.path} #{test_reported}"
       end
 
-      #Remove color codes from provided string.  Color codes are of the format /(\e\[\d\d;\d\dm)+/. 
-      #@param [String] text The string to remove color codes from
-      #@return [String] The text without color codes
-      def strip_color_codes(text)
-        text.gsub(/(\e|\^\[)\[(\d*;)*\d*m/, '')
-      end
-
-      # Determine if the provided number falls in the range of accepted xml unicode values
-      # See http://www.w3.org/TR/xml/#charsets for valid for valid character specifications.
-      # @param [Integer] int The number to check against
-      # @return [Boolean] True, if the number corresponds to a valid xml unicode character, otherwise false
-      def is_valid_xml(int)
-        return ( int == 0x9 or
-                 int == 0xA or
-               ( int >= 0x0020 and int <= 0xD7FF ) or
-               ( int >= 0xE000 and int <= 0xFFFD ) or
-               ( int >= 0x100000 and int <= 0x10FFFF )
-        )
-      end
-
-      # Escape invalid XML UTF-8 codes from provided string, see http://www.w3.org/TR/xml/#charsets for valid
-      # character specification
-      # @param [String] string The string to remove invalid codes from
-      def escape_invalid_xml_chars string
-        escaped_string = ""
-        string.chars.each do |i|
-          char_as_codestring = i.unpack("U*").join
-          if is_valid_xml(char_as_codestring.to_i)
-            escaped_string << i
-          else
-            escaped_string << "\\#{char_as_codestring}"
-          end
-        end
-        escaped_string
-      end
+      def write_junit_xml(xml_file)
+        stylesheet = File.join(@options[:project_root], @options[:xml_stylesheet])
 
-      # Remove color codes and invalid XML characters from provided string
-      # @param [String] string The string to format
-      def format_cdata string
-        escape_invalid_xml_chars(strip_color_codes(string))
-      end
-
-      #Format and print the {TestSuiteResult} as JUnit XML
-      #@param [String] xml_file The full path to print the output to.
-      #@param [String] stylesheet The full path to a JUnit XML stylesheet
-      def write_junit_xml(xml_file, stylesheet)
         begin
-
-          #copy stylesheet into xml directory
-          if not File.file?(File.join(File.dirname(xml_file), File.basename(stylesheet)))
-            FileUtils.copy(stylesheet, File.join(File.dirname(xml_file), File.basename(stylesheet)))
-          end
-          suites = nil
-          #check to see if an output file already exists, if it does add or replace test suite data
-          if File.file?(xml_file)
-            doc = Nokogiri::XML( File.open(xml_file, 'r') )
-            suites = doc.at_xpath('testsuites')
-            #remove old data
-            doc.search("//testsuite").each do |node|
-              if node['name'] =~ /#{@name}/
-                node.unlink
-              end
+          LoggerJunit.write_xml(xml_file, stylesheet) do |doc, suites|
+
+            suite = Nokogiri::XML::Node.new('testsuite', doc)
+            suite['name']     = @name
+            suite['tests']    = test_count
+            suite['errors']   = errored_tests
+            suite['failures'] = failed_tests
+            suite['skip']     = skipped_tests
+            suite['pending']  = pending_tests
+            suite['total']    = @total_tests
+            suite['time']     = "%f" % (stop_time - start_time)
+            properties = Nokogiri::XML::Node.new('properties', doc)
+            @options.each_pair do | name, value |
+              property = Nokogiri::XML::Node.new('property', doc)
+              property['name']  = name
+              property['value'] = value
+              properties.add_child(property)
             end
-          else
-            #no existing file, create a new one
-            doc = Nokogiri::XML::Document.new()
-            doc.encoding = 'UTF-8'
-            pi = Nokogiri::XML::ProcessingInstruction.new(doc, "xml-stylesheet", "type=\"text/xsl\" href=\"#{File.basename(stylesheet)}\"")
-            pi.parent = doc
-            suites = Nokogiri::XML::Node.new('testsuites', doc)
-            suites.parent = doc
-          end
+            suite.add_child(properties)
+
+            @test_cases.each do |test|
+              item = Nokogiri::XML::Node.new('testcase', doc)
+              item['classname'] = File.dirname(test.path)
+              item['name']      = File.basename(test.path)
+              item['time']      = "%f" % test.runtime
+
+              # Did we fail?  If so, report that.
+              # We need to remove the escape character from colorized text, the
+              # substitution of other entities is handled well by Rexml
+              if test.test_status == :fail || test.test_status == :error then
+                status = Nokogiri::XML::Node.new('failure', doc)
+                status['type'] =  test.test_status.to_s
+                if test.exception then
+                  status['message'] = test.exception.to_s.gsub(/\e/, '')
+                  data = LoggerJunit.format_cdata(test.exception.backtrace.join('\n'))
+                  status.add_child(status.document.create_cdata(data))
+                end
+                item.add_child(status)
+              end
 
-          suite = Nokogiri::XML::Node.new('testsuite', doc)
-          suite['name']     = @name
-          suite['tests']    = test_count
-          suite['errors']   = errored_tests
-          suite['failures'] = failed_tests
-          suite['skip']     = skipped_tests
-          suite['pending']  = pending_tests
-          suite['total']    = @total_tests
-          suite['time']     = "%f" % (stop_time - start_time)
-          properties = Nokogiri::XML::Node.new('properties', doc)
-          @options.each_pair do | name, value |
-            property = Nokogiri::XML::Node.new('property', doc)
-            property['name']  = name
-            property['value'] = value
-            properties.add_child(property)
-          end
-          suite.add_child(properties)
-
-          @test_cases.each do |test|
-            item = Nokogiri::XML::Node.new('testcase', doc)
-            item['classname'] = File.dirname(test.path)
-            item['name']      = File.basename(test.path)
-            item['time']      = "%f" % test.runtime
-
-            # Did we fail?  If so, report that.
-            # We need to remove the escape character from colorized text, the
-            # substitution of other entities is handled well by Rexml
-            if test.test_status == :fail || test.test_status == :error then
-              status = Nokogiri::XML::Node.new('failure', doc)
-              status['type'] =  test.test_status.to_s
-              if test.exception then
-                status['message'] = test.exception.to_s.gsub(/\e/, '')
-                data = format_cdata(test.exception.backtrace.join('\n'))
-                status.add_child(status.document.create_cdata(data))
+              if test.test_status == :skip
+                status = Nokogiri::XML::Node.new('skip', doc)
+                status['type'] =  test.test_status.to_s
+                item.add_child(status)
               end
-              item.add_child(status)
-            end
 
-            if test.test_status == :skip
-              status = Nokogiri::XML::Node.new('skip', doc)
-              status['type'] =  test.test_status.to_s
-              item.add_child(status)
-            end
+              if test.test_status == :pending
+                status = Nokogiri::XML::Node.new('pending', doc)
+                status['type'] =  test.test_status.to_s
+                item.add_child(status)
+              end
 
-            if test.test_status == :pending
-              status = Nokogiri::XML::Node.new('pending', doc)
-              status['type'] =  test.test_status.to_s
-              item.add_child(status)
-            end
+              if test.sublog then
+                stdout = Nokogiri::XML::Node.new('system-out', doc)
+                data = LoggerJunit.format_cdata(test.sublog)
+                stdout.add_child(stdout.document.create_cdata(data))
+                item.add_child(stdout)
+              end
 
-            if test.sublog then
-              stdout = Nokogiri::XML::Node.new('system-out', doc)
-              data = format_cdata(test.sublog)
-              stdout.add_child(stdout.document.create_cdata(data))
-              item.add_child(stdout)
-            end
+              if test.last_result and test.last_result.stderr and not test.last_result.stderr.empty? then
+                stderr = Nokogiri::XML::Node.new('system-err', doc)
+                data = LoggerJunit.format_cdata(test.last_result.stderr)
+                stderr.add_child(stderr.document.create_cdata(data))
+                item.add_child(stderr)
+              end
 
-            if test.last_result and test.last_result.stderr and not test.last_result.stderr.empty? then
-              stderr = Nokogiri::XML::Node.new('system-err', doc)
-              data = format_cdata(test.last_result.stderr)
-              stderr.add_child(stderr.document.create_cdata(data))
-              item.add_child(stderr)
+              suite.add_child(item)
             end
-
-            suite.add_child(item)
+            suites.add_child(suite)
           end
-          suites.add_child(suite)
-
-          # junit/name.xml will be created in a directory relative to the CWD
-          # --  JLS 2/12
-          File.open(xml_file, 'w') { |fh| fh.write(doc.to_xml) }
-
         rescue Exception => e
           @logger.error "failure in XML output:\n#{e.to_s}\n" + e.backtrace.join("\n")
         end
-      end
 
+      end
     end
 
     attr_reader :name, :options, :fail_mode
@@ -380,7 +309,7 @@ module Beaker
       # of the suite – or, at least, making them highly confusing for anyone who
       # has not studied the implementation in detail. --daniel 2011-03-14
       @test_suite_results.summarize( Logger.new(log_path("#{name}-summary.txt", @options[:log_dated_dir]), STDOUT) )
-      @test_suite_results.write_junit_xml( log_path(@options[:xml_file], @options[:xml_dated_dir]), File.join(@options[:project_root], @options[:xml_stylesheet]) )
+      @test_suite_results.write_junit_xml( log_path(@options[:xml_file], @options[:xml_dated_dir]) )
 
       #All done with this run, remove run log
       @logger.remove_destination(run_log)