summaryrefslogtreecommitdiffstats
path: root/test/server
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-10-02 01:55:09 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2005-10-02 01:55:09 +0000
commited42371ca97af285ab326691c5d33f55c727f981 (patch)
tree766d6045764be6c74eb1025e858138570f50a858 /test/server
parent6af0e0e5959e7b405191e0a916be097454a656e4 (diff)
downloadpuppet-ed42371ca97af285ab326691c5d33f55c727f981.tar.gz
puppet-ed42371ca97af285ab326691c5d33f55c727f981.tar.xz
puppet-ed42371ca97af285ab326691c5d33f55c727f981.zip
Switched @should to an array, so all objects can now handle that. I have not yet gone through and done the other cool things that can result, but that will have to wait until tomorrow. Also, I moved all of the pfile states into separate files, since the file was getting unweildy.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@712 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/server')
-rw-r--r--test/server/tc_bucket.rb1
-rw-r--r--test/server/tc_master.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/test/server/tc_bucket.rb b/test/server/tc_bucket.rb
index 8a7e71511..49f01287a 100644
--- a/test/server/tc_bucket.rb
+++ b/test/server/tc_bucket.rb
@@ -196,6 +196,7 @@ class TestBucket < ServerTest
files = filelist()
tmpdir = File.join(tmpdir(),"tmpfiledir")
+ @@tmpfiles << tmpdir
FileUtils.mkdir_p(tmpdir)
Puppet[:autosign] = true
diff --git a/test/server/tc_master.rb b/test/server/tc_master.rb
index 4fb8df8b2..f4d5d967b 100644
--- a/test/server/tc_master.rb
+++ b/test/server/tc_master.rb
@@ -105,6 +105,7 @@ class TestMaster < ServerTest
manifest = mktestmanifest()
file2 = @createdfile + "2"
+ @@tmpfiles << file2
client = master = nil
assert_nothing_raised() {