From 3aed1519aa8a43f0da42458bb53da42a63578c98 Mon Sep 17 00:00:00 2001 From: Dan Bode <dan@puppetlabs.com> Date: Wed, 14 Mar 2012 16:42:48 -0700 Subject: [PATCH] Remove find_spec_utils This spec_helper was causing failurs and was not actually even used for anything. Removing it resolves the issues with running spec tests. --- spec/find_spec_utils.rb | 14 -------------- spec/unit/type/nova_config_spec.rb | 1 - 2 files changed, 15 deletions(-) delete mode 100644 spec/find_spec_utils.rb diff --git a/spec/find_spec_utils.rb b/spec/find_spec_utils.rb deleted file mode 100644 index fa92d513b..000000000 --- a/spec/find_spec_utils.rb +++ /dev/null @@ -1,14 +0,0 @@ -def find_puppet_spec() - puppetdir = $LOAD_PATH.detect do |file| - File.directory?(File.join(file, 'puppet')) && - File.directory?(File.join(file, '../spec/lib')) - end - raise Exception, "could not find puppet spec lib" unless puppetdir - $LOAD_PATH.unshift(File.join(puppetdir, '../spec/lib')) - $LOAD_PATH.unshift(File.join(puppetdir, '../spec')) - require File.join(puppetdir, '../spec/spec_helper') -end -find_puppet_spec -require 'puppet_spec/files' -include PuppetSpec -include PuppetSpec::Files diff --git a/spec/unit/type/nova_config_spec.rb b/spec/unit/type/nova_config_spec.rb index aa9d7c124..a905d7b1e 100644 --- a/spec/unit/type/nova_config_spec.rb +++ b/spec/unit/type/nova_config_spec.rb @@ -1,4 +1,3 @@ -require File.join(File.dirname(__FILE__), '../../find_spec_utils.rb') require 'puppet' require 'puppet/type/nova_config' describe 'Puppet::Type.type(:nova_config)' do