--test-server/--restrict bug fix

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r0-12@445 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

2 files changed, 11 insertions, 4 deletions

diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 2ed73c6..2c51e79 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,3 +1,10 @@
+New in v0.12.5 (??????????)
+---------------------------
+
+Fixed bug in --test-server when using --restrict security options
+(test would fail improperly).  Thanks to Maik Schreiber for report.
+
+
 New in v0.12.4 (2003/09/13)
 ---------------------------
 
diff --git a/rdiff-backup/rdiff_backup/SetConnections.py b/rdiff-backup/rdiff_backup/SetConnections.py
index e5d081e..63730f4 100644
--- a/rdiff-backup/rdiff_backup/SetConnections.py
+++ b/rdiff-backup/rdiff_backup/SetConnections.py
@@ -25,7 +25,7 @@ the related connections.
 
 """
 
-import os
+import os, sys
 from log import Log
 import Globals, FilenameMapping, connection, rpath
 
@@ -226,9 +226,9 @@ def test_connection(conn_number):
 	print "Testing server started by: ", __conn_remote_cmds[conn_number]
 	conn = Globals.connections[conn_number]
 	try:
-		assert conn.pow(2,3) == 8
-		assert conn.os.path.join("a", "b") == "a/b"
-		version = conn.reval("lambda: Globals.version")
+		assert conn.Globals.get('current_time') is None
+		assert type(conn.os.getuid()) is int
+		version = conn.Globals.get('version')
 	except:
 		sys.stderr.write("Server tests failed\n")
 		raise