[Rdiff-backup-commits] Changes to rdiff-backup/testing/user_grouptest.py

[Ben Escoto]

Index: rdiff-backup/testing/user_grouptest.py
diff -u rdiff-backup/testing/user_grouptest.py:1.2 
rdiff-backup/testing/user_grouptest.py:1.3
--- rdiff-backup/testing/user_grouptest.py:1.2  Wed Apr 13 02:58:58 2005
+++ rdiff-backup/testing/user_grouptest.py      Thu Oct 20 19:34:51 2005
@@ -12,6 +12,19 @@
                assert user_group.uid2uname(0) == "root"
                assert user_group.gid2gname(0) == "root"
                assert user_group.gid2gname(0) == "root"
+               # Assume no user has uid 29378
+               assert user_group.gid2gname(29378) is None
+               assert user_group.gid2gname(29378) is None
+
+       def test_basic_reverse(self):
+               """Test basic name2id.  Depends on systems users/groups"""
+               user_group.uname2uid_dict = {}; user_group.gname2gid_dict = {}
+               assert user_group.uname2uid("root") == 0
+               assert user_group.uname2uid("root") == 0
+               assert user_group.gname2gid("root") == 0
+               assert user_group.gname2gid("root") == 0
+               assert user_group.uname2uid("aoeuth3t2ug89") is None
+               assert user_group.uname2uid("aoeuth3t2ug89") is None
 
        def test_default_mapping(self):
                """Test the default user mapping"""
@@ -20,9 +33,10 @@
                binid = pwd.getpwnam('bin')[2]
                syncid = pwd.getpwnam('sync')[2]
                user_group.init_user_mapping()
-               assert user_group.UserMap.get_id(0) == 0
-               assert user_group.UserMap.get_id(0, 'bin') == binid
-               assert user_group.UserMap.get_id(binid, 'sync') == syncid
+               assert user_group.UserMap(0) == 0
+               assert user_group.UserMap(0, 'bin') == binid
+               assert user_group.UserMap(0, 'sync') == syncid
+               assert user_group.UserMap.map_acl(0, 'aoeuth3t2ug89') is None
 
        def test_user_mapping(self):
                """Test the user mapping file through the DefinedMap class"""
@@ -39,15 +53,18 @@
                daemonid = pwd.getpwnam('daemon')[2]
                user_group.init_user_mapping(mapping_string)
 
-               assert user_group.UserMap.get_id(rootid, 'root') == binid
-               assert user_group.UserMap.get_id(binid, 'bin') == rootid
-               assert user_group.UserMap.get_id(0) == syncid
-               assert user_group.UserMap.get_id(syncid, 'sync') == 0
-               assert user_group.UserMap.get_id(500) == 501
-
-               assert user_group.UserMap.get_id(501) == 501
-               assert user_group.UserMap.get_id(123, 'daemon') == daemonid
-               
+               assert user_group.UserMap(rootid, 'root') == binid
+               assert user_group.UserMap(binid, 'bin') == rootid
+               assert user_group.UserMap(0) == syncid
+               assert user_group.UserMap(syncid, 'sync') == 0
+               assert user_group.UserMap(500) == 501
+
+               assert user_group.UserMap(501) == 501
+               assert user_group.UserMap(123, 'daemon') == daemonid
+
+               assert user_group.UserMap.map_acl(29378, 'aoeuth3t2ug89') is 
None
+               assert user_group.UserMap.map_acl(0, 'aoeuth3t2ug89') is syncid
+
                if 0: code.InteractiveConsole(globals()).interact()
 
        def test_overflow(self):