summaryrefslogtreecommitdiffstats
path: root/test/lib/puppettest/support/assertions.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-09-13 22:57:48 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-09-13 22:57:48 -0700
commit754ed19a8105a1be01c723a91abf9999ec6a8ab3 (patch)
tree8a3b59432ff56fbaf64d1cb6448e4e228f5359c0 /test/lib/puppettest/support/assertions.rb
parent21afb51a1b84116b2a906a6959ae588f45135104 (diff)
parentefa834aaec596b0d5e7b314a53e6b258ce44728c (diff)
downloadpuppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.tar.gz
puppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.tar.xz
puppet-754ed19a8105a1be01c723a91abf9999ec6a8ab3.zip
Merge commit '2.6.1rc4'
Diffstat (limited to 'test/lib/puppettest/support/assertions.rb')
-rw-r--r--test/lib/puppettest/support/assertions.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/lib/puppettest/support/assertions.rb b/test/lib/puppettest/support/assertions.rb
index 7f326b119..31fa3f1da 100644
--- a/test/lib/puppettest/support/assertions.rb
+++ b/test/lib/puppettest/support/assertions.rb
@@ -1,8 +1,6 @@
-require 'puppettest'
require 'puppettest/support/utils'
require 'fileutils'
-
module PuppetTest
include PuppetTest::Support::Utils
def assert_logged(level, regex, msg = nil)