diff options
Diffstat (limited to 'rdiff-backup/rdiff_backup/SetConnections.py')
| -rw-r--r-- | rdiff-backup/rdiff_backup/SetConnections.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/rdiff-backup/rdiff_backup/SetConnections.py b/rdiff-backup/rdiff_backup/SetConnections.py index d4e1a59..793674c 100644 --- a/rdiff-backup/rdiff_backup/SetConnections.py +++ b/rdiff-backup/rdiff_backup/SetConnections.py @@ -241,19 +241,24 @@ def CloseConnections(): Globals.backup_reader = Globals.isbackup_reader = \ Globals.backup_writer = Globals.isbackup_writer = None -def TestConnections(): +def TestConnections(rpaths): """Test connections, printing results""" if len(Globals.connections) == 1: print "No remote connections specified" else: - for i in range(1, len(Globals.connections)): test_connection(i) + assert len(Globals.connection) == len(rpaths) + 1 + for i in range(1, len(Globals.connections)): + test_connection(i, rpaths[i-1]) -def test_connection(conn_number): +def test_connection(conn_number, rp): """Test connection. conn_number 0 is the local connection""" print "Testing server started by: ", __conn_remote_cmds[conn_number] conn = Globals.connections[conn_number] try: assert conn.Globals.get('current_time') is None - assert type(conn.os.listdir('.')) is list + try: + assert type(conn.os.getuid()) is int + except AttributeError: # Windows doesn't support os.getuid() + assert type(conn.os.listdir(rp.path)) is list version = conn.Globals.get('version') except: sys.stderr.write("Server tests failed\n") |