From d03f68eaed6d05483128b495ad1faaf89208d66a Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Fri, 26 Oct 2007 11:26:57 -0500 Subject: Changing the test/ classes so that they work from the main test/ dir or from their own working dir, like the specs do. This was just a question of changing how their libraries are loaded. --- test/language/ast.rb | 2 +- test/language/ast/casestatement.rb | 2 +- test/language/ast/definition.rb | 2 +- test/language/ast/hostclass.rb | 2 +- test/language/ast/resource.rb | 2 +- test/language/ast/resource_reference.rb | 2 +- test/language/ast/selector.rb | 2 +- test/language/ast/variable.rb | 2 +- test/language/collector.rb | 2 +- test/language/compile.rb | 2 +- test/language/functions.rb | 2 +- test/language/lexer.rb | 2 +- test/language/parser.rb | 2 +- test/language/resource.rb | 2 +- test/language/scope.rb | 2 +- test/language/snippets.rb | 2 +- test/language/transportable.rb | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) (limited to 'test/language') diff --git a/test/language/ast.rb b/test/language/ast.rb index dbc1d04ed..141d27087 100755 --- a/test/language/ast.rb +++ b/test/language/ast.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppettest' require 'puppet/parser/interpreter' diff --git a/test/language/ast/casestatement.rb b/test/language/ast/casestatement.rb index 4623a2235..0a744b686 100755 --- a/test/language/ast/casestatement.rb +++ b/test/language/ast/casestatement.rb @@ -3,7 +3,7 @@ # Created by Luke A. Kanies on 2006-12-22. # Copyright (c) 2006. All rights reserved. -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../../lib/puppettest' require 'puppettest' require 'puppettest/parsertesting' diff --git a/test/language/ast/definition.rb b/test/language/ast/definition.rb index d4c987362..b4d58a289 100755 --- a/test/language/ast/definition.rb +++ b/test/language/ast/definition.rb @@ -3,7 +3,7 @@ # Created by Luke A. Kanies on 2006-02-20. # Copyright (c) 2006. All rights reserved. -$:.unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../../lib/puppettest' require 'puppettest' require 'mocha' diff --git a/test/language/ast/hostclass.rb b/test/language/ast/hostclass.rb index f747779b3..62d4f9ee3 100755 --- a/test/language/ast/hostclass.rb +++ b/test/language/ast/hostclass.rb @@ -3,7 +3,7 @@ # Created by Luke A. Kanies on 2006-02-20. # Copyright (c) 2006. All rights reserved. -$:.unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../../lib/puppettest' require 'puppettest' require 'puppettest/parsertesting' diff --git a/test/language/ast/resource.rb b/test/language/ast/resource.rb index 9ef5181af..49c64112d 100755 --- a/test/language/ast/resource.rb +++ b/test/language/ast/resource.rb @@ -3,7 +3,7 @@ # Created by Luke A. Kanies on 2007-07-8. # Copyright (c) 2007. All rights reserved. -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../../lib/puppettest' require 'puppettest' require 'puppettest/parsertesting' diff --git a/test/language/ast/resource_reference.rb b/test/language/ast/resource_reference.rb index e8883afb9..d3b1ffd8f 100755 --- a/test/language/ast/resource_reference.rb +++ b/test/language/ast/resource_reference.rb @@ -3,7 +3,7 @@ # Created by Luke A. Kanies on 2007-07-8. # Copyright (c) 2007. All rights reserved. -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../../lib/puppettest' require 'puppettest' require 'puppettest/parsertesting' diff --git a/test/language/ast/selector.rb b/test/language/ast/selector.rb index 7394f5f7d..535fcbf70 100755 --- a/test/language/ast/selector.rb +++ b/test/language/ast/selector.rb @@ -3,7 +3,7 @@ # Created by Luke A. Kanies on 2006-12-22. # Copyright (c) 2006. All rights reserved. -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../../lib/puppettest' require 'puppettest' require 'puppettest/parsertesting' diff --git a/test/language/ast/variable.rb b/test/language/ast/variable.rb index bf22021d0..09122ce16 100755 --- a/test/language/ast/variable.rb +++ b/test/language/ast/variable.rb @@ -3,7 +3,7 @@ # Created by Luke A. Kanies on 2007-0419. # Copyright (c) 2006. All rights reserved. -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../../lib/puppettest' require 'puppettest' require 'puppettest/parsertesting' diff --git a/test/language/collector.rb b/test/language/collector.rb index 55c93c2d5..30949c061 100755 --- a/test/language/collector.rb +++ b/test/language/collector.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppettest' require 'puppettest/parsertesting' diff --git a/test/language/compile.rb b/test/language/compile.rb index 7a8a613af..07ef54626 100755 --- a/test/language/compile.rb +++ b/test/language/compile.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'mocha' require 'puppettest' diff --git a/test/language/functions.rb b/test/language/functions.rb index db107fd36..746ba4b1d 100755 --- a/test/language/functions.rb +++ b/test/language/functions.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppet/parser/parser' diff --git a/test/language/lexer.rb b/test/language/lexer.rb index 38a7ddb22..e09828d51 100755 --- a/test/language/lexer.rb +++ b/test/language/lexer.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppet/parser/lexer' diff --git a/test/language/parser.rb b/test/language/parser.rb index 1e7adb45e..04cd3a095 100755 --- a/test/language/parser.rb +++ b/test/language/parser.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'mocha' require 'puppet' diff --git a/test/language/resource.rb b/test/language/resource.rb index f25be93b5..942277bd1 100755 --- a/test/language/resource.rb +++ b/test/language/resource.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppettest' require 'puppettest/resourcetesting' diff --git a/test/language/scope.rb b/test/language/scope.rb index 22734a5fb..990ca9694 100755 --- a/test/language/scope.rb +++ b/test/language/scope.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'mocha' require 'puppettest' diff --git a/test/language/snippets.rb b/test/language/snippets.rb index 58a6e7f89..0806a40b4 100755 --- a/test/language/snippets.rb +++ b/test/language/snippets.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppet/parser/interpreter' diff --git a/test/language/transportable.rb b/test/language/transportable.rb index 4e4573e0b..7ea6a176d 100755 --- a/test/language/transportable.rb +++ b/test/language/transportable.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppet/transportable' -- cgit