Cleanups

tests/api2/test_011_user.py

@@ -190,8 +190,7 @@ def test_001_create_and_verify_testuser():
     assert results['result'] is False, str(results['output'])
 
     # non-smb users shouldn't show up in smb's passdb
-    assert not qry['sid']
-    assert not qry['nt_name']
+    assert qry['sid'] is None
 
 
 def test_002_verify_user_exists_in_pwd(request):
@@ -285,7 +284,6 @@ def test_006_verify_converted_smbuser_passdb_entry_exists(request):
     )
     assert qry
     assert qry['sid']
-    assert qry['nt_name']
 
 
 def test_007_add_smbuser_to_sudoers(request):
@@ -433,7 +431,6 @@ def test_031_create_user_with_homedir(request):
 
     # verify smb user passdb entry
     assert qry['sid']
-    assert qry['nt_name']
 
     # verify homedir acl is stripped
     st_info = call('filesystem.stat', UserAssets.TestUser02['query_response']['home'])
@@ -564,8 +561,7 @@ def test_042_disable_smb_user(request):
         {'get': True, 'extra': {'additional_information': ['SMB']}}
     )
     assert qry
-    assert qry['sid'] == ''
-    assert qry['nt_name'] == ''
+    assert qry['sid'] is None
 
 
 def test_043_raise_validation_error_on_homedir_collision(request):

tests/api2/test_420_smb.py

@@ -247,69 +247,14 @@ def test_043_recyclebin_functional_test_subdir(request, smb_config):
                 assert val == b'boo'
 
 
-@pytest.mark.dependency(name="SID_CHANGED")
 def test_056_netbios_name_change_check_sid(request):
-    """
-    This test changes the netbios name of the server and then
-    verifies that this results in the server's domain SID changing.
-    The new SID is stored in a global variable so that we can
-    perform additional tests to verify that SIDs are rewritten
-    properly in group_mapping.tdb. old_netbiosname is stored so
-    that we can reset configuration to what it was prior to the test.
-
-    Test failure here shows that we failed to write our new SID
-    to the configuration database.
-    """
-    depends(request, ["smb_initialized"], scope="session")
-    global new_sid
-    global old_netbiosname
-
-    smb_config = call('smb.config')
-    old_netbiosname = smb_config['netbiosname']
-    old_sid = smb_config['cifs_SID']
-
+    """ changing netbiosname should not alter our local sid value """
+    old_sid = call('smb.config')['cifs_SID']
     new_sid = call('smb.update', {'netbiosname': 'nb_new'})['cifs_SID']
-    assert new_sid != old_sid
-
-
-@pytest.mark.dependency(name="SID_TEST_GROUP")
-def test_057_create_new_smb_group_for_sid_test(request):
-    """
-    Create testgroup and verify that groupmap entry generated
-    with new SID.
-    """
-    def check_groupmap_for_entry(groupmaps, nt_name):
-        for entry in groupmaps:
-            if entry['nt_name'] == nt_name:
-                return entry
-
-        return None
-
-    depends(request, ["SID_CHANGED"], scope="session")
-    global smb_group_id
-
-    with group({'name': 'testsidgroup', 'smb': True}):
-        groupmaps = call('smb.groupmap_list')
-
-        test_entry = check_groupmap_for_entry(
-            groupmaps['local'].values(),
-            'testsidgroup'
-        )
-        assert test_entry is not None, groupmaps['local'].values()
-        domain_sid = test_entry['sid'].rsplit("-", 1)[0]
-        assert domain_sid == new_sid, groupmaps['local'].values()
-
-        call('smb.update', {'netbiosname': old_netbiosname})
-
-        groupmaps = call('smb.groupmap_list')
-        test_entry = check_groupmap_for_entry(
-            groupmaps['local'].values(),
-            'testsidgroup'
-        )
 
-        assert test_entry is not None, groupmaps['local'].values()
-        domain_sid = test_entry['sid'].rsplit("-", 1)[0]
-        assert domain_sid != new_sid, groupmaps['local'].values()
+    assert new_sid == old_sid
+    localsid = call('smb.groupmap_list')['localsid']
+    assert new_sid == localsid
 
 
 AUDIT_FIELDS = [