Allow PrivilegeEscalator to be disabled during tests.

2 files changed, 13 insertions, 4 deletions

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 8b594177e..d8f0e56a5 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -73,6 +73,8 @@ class PrivilegeEscalator
 public:
 	PrivilegeEscalator ();
 	~PrivilegeEscalator ();
+
+	static bool test;
 };
 
 /** @class Waker
diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index b6241ec1a..262ba59ce 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -373,16 +373,23 @@ unprivileged ()
 	}
 }
 
+
+bool PrivilegeEscalator::test = false;
+
 PrivilegeEscalator::~PrivilegeEscalator ()
 {
-	unprivileged ();
+	if (!test) {
+		unprivileged ();
+	}
 }
 
 PrivilegeEscalator::PrivilegeEscalator ()
 {
-	int const r = seteuid(0);
-	if (r < 0) {
-		throw PrivilegeError (String::compose("seteuid() call failed with %1", errno));
+	if (!test) {
+		int const r = seteuid(0);
+		if (r < 0) {
+			throw PrivilegeError (String::compose("seteuid() call failed with %1", errno));
+		}
 	}
 }