Changeset - 07844f0bc410
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Thomas De Schampheleire - 9 years ago 2016-08-25 21:16:27
thomas.de.schampheleire@gmail.com
tests: get rid of yield-based tests

yield-based tests (tests that are actually generating tests) are a nose
feature which were also supported in pytest. However, since pytest-3.0 this
type of tests is deprecated, they will be removed in pytest-4.0.

The only yield tests present in the kallithea test suite are simply yielding
a method that does a single assert. The benefit of having each of these
asserts in a separate test is not very high.

Replace the yield by a direct call to the previously-yielded method. This
means the total test count reduces but the actual amount of test code is the
same.
2 files changed with 38 insertions and 38 deletions:
kallithea/tests/models/test_user_group_permissions_on_repo_groups.py
16
16
kallithea/tests/models/test_user_permissions_on_repo_groups.py
22
22
0 comments (0 inline, 0 general)
kallithea/tests/models/test_user_group_permissions_on_repo_groups.py
➞
Show inline comments
 
@@ -71,13 +71,13 @@ def test_user_permissions_on_group_witho
 
    expected = 0
 
    assert len(items) == expected, ' %s != %s' % (len(items), expected)
 
    for name, perm in items:
 
        yield check_tree_perms, name, perm, group, 'repository.read'
 
        check_tree_perms(name, perm, group, 'repository.read')
 

			




	
	
	
		
 
    items = [x for x in _get_group_perms(group, recursive)]

			




	
	
	
		
 
    expected = 1

			




	
	
	
		
 
    assert len(items) == expected, ' %s != %s' % (len(items), expected)

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.write')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_without_recursive_mode_subgroup():

			




	
	
		
 
@@ -90,13 +90,13 @@ def test_user_permissions_on_group_witho

			




	
	
	
		
 
    expected = 0

			




	
	
	
		
 
    assert len(items) == expected, ' %s != %s' % (len(items), expected)

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.read'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.read')

			




	
	
	
		
 

			




	
	
	
		
 
    items = [x for x in _get_group_perms(group, recursive)]

			




	
	
	
		
 
    expected = 1

			




	
	
	
		
 
    assert len(items) == expected, ' %s != %s' % (len(items), expected)

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.write')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode():

			




	
	
		
 
@@ -112,10 +112,10 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.write')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.write')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode_inner_group():

			




	
	
		
 
@@ -129,10 +129,10 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.none'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.none')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.none'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.none')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode_deepest():

			




	
	
		
 
@@ -146,10 +146,10 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.write')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.write')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode_only_with_repos():

			




	
	
		
 
@@ -163,10 +163,10 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.admin'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.admin')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.admin'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.admin')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode_on_repos():

			




	
	
		
 
@@ -181,7 +181,7 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.write')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        # permission is set with repos only mode, but we also change the permission

			




	
	
		
 
@@ -190,7 +190,7 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
        old_perm = 'group.read'

			




	
	
	
		
 
        if name == group:

			




	
	
	
		
 
            old_perm = perm

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, old_perm

			




	
	
	
		
 
        check_tree_perms(name, perm, group, old_perm)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode_on_repo_groups():

			




	
	
		
 
@@ -205,7 +205,7 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.read'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.read')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.none'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.none')

			




        

    


    
    

    

        

                

                    kallithea/tests/models/test_user_permissions_on_repo_groups.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -65,13 +65,13 @@ def test_user_permissions_on_group_witho

			




	
	
	
		
 
    expected = 0

			




	
	
	
		
 
    assert len(items) == expected, ' %s != %s' % (len(items), expected)

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.read'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.read')

			




	
	
	
		
 

			




	
	
	
		
 
    items = [x for x in _get_group_perms(group, recursive)]

			




	
	
	
		
 
    expected = 1

			




	
	
	
		
 
    assert len(items) == expected, ' %s != %s' % (len(items), expected)

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.write')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_without_recursive_mode_subgroup():

			




	
	
		
 
@@ -84,13 +84,13 @@ def test_user_permissions_on_group_witho

			




	
	
	
		
 
    expected = 0

			




	
	
	
		
 
    assert len(items) == expected, ' %s != %s' % (len(items), expected)

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.read'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.read')

			




	
	
	
		
 

			




	
	
	
		
 
    items = [x for x in _get_group_perms(group, recursive)]

			




	
	
	
		
 
    expected = 1

			




	
	
	
		
 
    assert len(items) == expected, ' %s != %s' % (len(items), expected)

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.write')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode():

			




	
	
		
 
@@ -106,10 +106,10 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.write')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.write')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode_for_default_user():

			




	
	
		
 
@@ -133,10 +133,10 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.write')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.write')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode_inner_group():

			




	
	
		
 
@@ -150,10 +150,10 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.none'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.none')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.none'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.none')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode_deepest():

			




	
	
		
 
@@ -167,10 +167,10 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.write')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.write')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_mode_only_with_repos():

			




	
	
		
 
@@ -184,10 +184,10 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.admin'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.admin')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.admin'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.admin')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_repo_mode_for_default_user():

			




	
	
		
 
@@ -212,7 +212,7 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.none'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.none')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        # permission is set with repos only mode, but we also change the permission

			




	
	
		
 
@@ -221,7 +221,7 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
        old_perm = 'group.read'

			




	
	
	
		
 
        if name == group:

			




	
	
	
		
 
            old_perm = perm

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, old_perm

			




	
	
	
		
 
        check_tree_perms(name, perm, group, old_perm)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_repo_mode_inner_group():

			




	
	
		
 
@@ -236,7 +236,7 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.none'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.none')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        # permission is set with repos only mode, but we also change the permission

			




	
	
		
 
@@ -245,7 +245,7 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
        old_perm = 'group.read'

			




	
	
	
		
 
        if name == group:

			




	
	
	
		
 
            old_perm = perm

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, old_perm

			




	
	
	
		
 
        check_tree_perms(name, perm, group, old_perm)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_group_mode_for_default_user():

			




	
	
		
 
@@ -269,10 +269,10 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.read'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.read')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.write'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.write')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def test_user_permissions_on_group_with_recursive_group_mode_inner_group():

			




	
	
		
 
@@ -286,7 +286,7 @@ def test_user_permissions_on_group_with_

			




	
	
	
		
 
    _check_expected_count(items, repo_items, expected_count(group, True))

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in repo_items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'repository.read'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'repository.read')

			




	
	
	
		
 

			




	
	
	
		
 
    for name, perm in items:

			




	
	
	
		
 
        yield check_tree_perms, name, perm, group, 'group.none'

			




	
	
	
		
 
        check_tree_perms(name, perm, group, 'group.none')

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.