18
18
19
19
import pytest
20
20
21
- from logging import getLogger
21
+ import logging
22
22
23
23
from acktest .k8s import condition
24
24
from acktest .k8s import resource as k8s
34
34
# Little longer to delete the policy since it's referred-to from the role...
35
35
DELETE_POLICY_TIMEOUT_SECONDS = 30
36
36
CHECK_WAIT_AFTER_REF_RESOLVE_SECONDS = 10
37
- TESTING_NAMESPACE = "custom_namespace"
38
37
39
- log = getLogger (__name__ )
40
38
41
39
@pytest .fixture (scope = "module" )
42
40
def referred_policy_name ():
43
41
return random_suffix_name ("referred-policy" , 24 )
44
42
45
-
46
43
@pytest .fixture (scope = "module" )
47
- def referring_role (request , referred_policy_name ):
44
+ def referred_policy_namspace ():
45
+ return random_suffix_name ("policy-namespace" , 24 )
46
+
47
+
48
+ @pytest .fixture (scope = "function" )
49
+ def referring_role (request , referred_policy_name , referred_policy_namspace ):
48
50
role_name = random_suffix_name ("referring-role" , 24 )
49
51
50
52
marker = request .node .get_closest_marker ("resource_data" )
51
53
filename = "role_referring"
52
- namespace = "default"
54
+ replacements = REPLACEMENT_VALUES . copy ()
53
55
54
56
if marker is not None :
55
57
data = marker .args [0 ]
56
58
if 'withNamespace' in data and data ['withNamespace' ]:
57
59
filename = "role_referring_namespace"
58
- namespace = TESTING_NAMESPACE
59
- replacements ['POLICY_NAMESPACE' ] = namespace
60
+ replacements ['POLICY_NAMESPACE' ] = referred_policy_namspace
60
61
61
- replacements = REPLACEMENT_VALUES .copy ()
62
62
replacements ['ROLE_NAME' ] = role_name
63
63
replacements ['POLICY_NAME' ] = referred_policy_name
64
64
@@ -69,7 +69,7 @@ def referring_role(request, referred_policy_name):
69
69
70
70
ref = k8s .CustomResourceReference (
71
71
CRD_GROUP , CRD_VERSION , ROLE_RESOURCE_PLURAL ,
72
- role_name , namespace = namespace ,
72
+ role_name , namespace = "default" ,
73
73
)
74
74
k8s .create_custom_resource (ref , resource_data )
75
75
cr = k8s .wait_resource_consumed_by_controller (ref )
@@ -95,26 +95,27 @@ def referring_role(request, referred_policy_name):
95
95
role .wait_until_deleted (role_name )
96
96
97
97
98
- @pytest .fixture (scope = "module " )
99
- def referred_policy (request , referred_policy_name ):
98
+ @pytest .fixture (scope = "function " )
99
+ def referred_policy (request , referred_policy_name , referred_policy_namspace ):
100
100
policy_desc = "a referred-to policy"
101
101
102
102
marker = request .node .get_closest_marker ("resource_data" )
103
103
filename = "policy_simple"
104
104
namespace = "default"
105
105
106
+ replacements = REPLACEMENT_VALUES .copy ()
107
+
106
108
if marker is not None :
107
109
data = marker .args [0 ]
108
- if 'withNamespace' in data :
109
- filename = "policy_simple_namespace"
110
- namespace = TESTING_NAMESPACE
111
- replacements ['POLICY_NAMESPACE' ] = namespace
110
+ if 'withNamespace' in data and data ['withNamespace' ]:
111
+ namespace = referred_policy_namspace
112
112
k8s .create_k8s_namespace (
113
113
namespace
114
114
)
115
+ time .sleep (CHECK_WAIT_AFTER_REF_RESOLVE_SECONDS )
116
+ filename = "policy_simple_namespace"
117
+ replacements ['POLICY_NAMESPACE' ] = namespace
115
118
116
-
117
- replacements = REPLACEMENT_VALUES .copy ()
118
119
replacements ['POLICY_NAME' ] = referred_policy_name
119
120
replacements ['POLICY_DESCRIPTION' ] = policy_desc
120
121
0 commit comments