Creating and using a new Puppet::Daemon class

This replaces the short-lived EventManager class, all of
the service- and timer-related code in puppet.rb, and moves
code from agent.rb, server.rb, and other places into one
class responsible for starting, stopping, pids, and more.

The Daemon module is no longer in existence, so it's been
removed from the classes that were using it.

Signed-off-by: Luke Kanies <luke@madstop.com>

1 files changed, 0 insertions, 70 deletions

diff --git a/test/network/daemon.rb b/test/network/daemon.rb
deleted file mode 100755
index 5105c6e4c..000000000
--- a/test/network/daemon.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../lib/puppettest'
-
-require 'puppettest'
-require 'puppet/daemon'
-
-class TestDaemon < Test::Unit::TestCase
-	include PuppetTest
-
-    class FakeDaemon
-        include Puppet::Daemon
-    end
-
-    def test_pidfile
-        daemon = FakeDaemon.new
-
-        assert_nothing_raised("removing non-existent file failed") do
-            daemon.rmpidfile
-        end
-
-        Puppet[:pidfile] = tempfile()
-        assert_nothing_raised "could not lock" do
-            daemon.setpidfile
-        end
-
-        assert(FileTest.exists?(daemon.pidfile),
-            "did not create pidfile")
-
-        assert_nothing_raised("removing non-existent file failed") do
-            daemon.rmpidfile
-        end
-
-        assert(! FileTest.exists?(daemon.pidfile),
-            "did not remove pidfile")
-    end
-
-    def test_daemonize
-        daemon = FakeDaemon.new
-        Puppet[:pidfile] = tempfile()
-
-        exiter = tempfile()
-
-        assert_nothing_raised("Could not fork and daemonize") do
-            fork do
-                daemon.send(:daemonize)
-                # Wait a max of 5 secs
-                50.times do
-                    if FileTest.exists?(exiter)
-                        daemon.rmpidfile
-                        exit(0)
-                    end
-                    sleep 0.1
-                end
-                exit(0)
-            end
-        end
-        sleep(0.1)
-        assert(FileTest.exists?(Puppet[:pidfile]),
-            "did not create pidfile on daemonize")
-
-        File.open(exiter, "w") { |f| f.puts "" }
-
-        sleep(0.2)
-        assert(! FileTest.exists?(Puppet[:pidfile]),
-            "did not remove pidfile on process death")
-    end
-end
-
-