From: Shawn Routhier <sar@isc.org>
Date: Thu, 29 Jan 2015 03:37:39 +0000 (-0800)
Subject: [trac3867] Update PIDFile test code per review comments
X-Git-Tag: trac3712_base~29^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d93715fd48103fbf70293b20b013be62a593e907;p=thirdparty%2Fkea.git

[trac3867] Update PIDFile test code per review comments

Update the PIDFile test code to create the file for the
not writable test.

Add entry in ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index 7fc007d751..aed57c0270 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+880.	[func]		sar
+	A utility class has been added which handles writing and
+	deleting pid files as well as checking if the process with
+	the given pid is running.
+
 879.	[bug]		fdupont
 	Drop DHCPREQUEST message from an unknown client in the
 	INIT-REBOOT state.
diff --git a/src/lib/util/tests/pid_file_unittest.cc b/src/lib/util/tests/pid_file_unittest.cc
index d4eb09ae94..d8e79645e3 100644
--- a/src/lib/util/tests/pid_file_unittest.cc
+++ b/src/lib/util/tests/pid_file_unittest.cc
@@ -23,7 +23,6 @@ using namespace isc::util;
 
 // Filenames used for testing.
 const char* TESTNAME = "pid_file.test";
-const char* TESTNAME2 = "pid_file.test.2";
 
 class PIDFileTest : public ::testing::Test {
 public:
@@ -66,7 +65,6 @@ private:
     /// @brief Removes any remaining test files
     void removeTestFile() const {
         remove(TESTNAME);
-        remove(TESTNAME2);
     }
 
 };
@@ -184,8 +182,14 @@ TEST_F(PIDFileTest, pidGarbage) {
 
 /// @brief Test failing to write a file.
 TEST_F(PIDFileTest, pidWriteFail) {
-    PIDFile pid_file(absolutePath(TESTNAME2));
+    PIDFile pid_file(absolutePath(TESTNAME));
+
+    // Create the test file and change it's permission bits
+    // so we can't write to it.
+    pid_file.write(10);
+    chmod(absolutePath(TESTNAME).c_str(), S_IRUSR);
 
+    // Now try a write to the file, expecting an exception
     EXPECT_THROW(pid_file.write(10), PIDFileError);
 }