Skip to content

Commit cf5d796

Browse files
committed
Ability to run e2e tests multiple times
1 parent 13ac533 commit cf5d796

File tree

1 file changed

+25
-23
lines changed

1 file changed

+25
-23
lines changed

kubernetes/e2e_test/test_client.py

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ def test_pod_apis(self):
5555
api = core_v1_api.CoreV1Api(client)
5656

5757
name = 'test-' + str(uuid.uuid4())
58-
5958
pod_manifest = {'apiVersion': 'v1',
6059
'kind': 'Pod',
6160
'metadata': {'color': 'blue', 'name': name},
@@ -84,38 +83,39 @@ def test_service_apis(self):
8483
client = api_client.ApiClient('http://127.0.0.1:8080/')
8584
api = core_v1_api.CoreV1Api(client)
8685

86+
name = 'frontend-' + str(uuid.uuid4())
8787
service_manifest = {'apiVersion': 'v1',
8888
'kind': 'Service',
89-
'metadata': {'labels': {'name': 'frontend'},
90-
'name': 'frontend',
89+
'metadata': {'labels': {'name': name},
90+
'name': name,
9191
'resourceversion': 'v1'},
9292
'spec': {'ports': [{'name': 'port',
9393
'port': 80,
9494
'protocol': 'TCP',
9595
'targetPort': 80}],
96-
'selector': {'name': 'frontend'}}}
96+
'selector': {'name': name}}}
9797

9898
resp = api.create_namespaced_service(body=service_manifest,
9999
namespace='default')
100-
self.assertEqual('frontend', resp.metadata.name)
100+
self.assertEqual(name, resp.metadata.name)
101101
self.assertTrue(resp.status)
102102

103-
resp = api.read_namespaced_service(name='frontend',
103+
resp = api.read_namespaced_service(name=name,
104104
namespace='default')
105-
self.assertEqual('frontend', resp.metadata.name)
105+
self.assertEqual(name, resp.metadata.name)
106106
self.assertTrue(resp.status)
107107

108108
service_manifest['spec']['ports'] = [{'name': 'new',
109109
'port': 8080,
110110
'protocol': 'TCP',
111111
'targetPort': 8080}]
112112
resp = api.patch_namespaced_service(body=service_manifest,
113-
name='frontend',
113+
name=name,
114114
namespace='default')
115115
self.assertEqual(2, len(resp.spec.ports))
116116
self.assertTrue(resp.status)
117117

118-
resp = api.delete_namespaced_service(name='frontend',
118+
resp = api.delete_namespaced_service(name=name,
119119
namespace='default')
120120

121121
@unittest.skipUnless(
@@ -124,15 +124,16 @@ def test_replication_controller_apis(self):
124124
client = api_client.ApiClient('http://127.0.0.1:8080/')
125125
api = core_v1_api.CoreV1Api(client)
126126

127+
name = 'frontend-' + str(uuid.uuid4())
127128
rc_manifest = {
128129
'apiVersion': 'v1',
129130
'kind': 'ReplicationController',
130-
'metadata': {'labels': {'name': 'frontend'},
131-
'name': 'frontend'},
131+
'metadata': {'labels': {'name': name},
132+
'name': name},
132133
'spec': {'replicas': 2,
133-
'selector': {'name': 'frontend'},
134+
'selector': {'name': name},
134135
'template': {'metadata': {
135-
'labels': {'name': 'frontend'}},
136+
'labels': {'name': name}},
136137
'spec': {'containers': [{
137138
'image': 'nginx',
138139
'name': 'nginx',
@@ -141,16 +142,16 @@ def test_replication_controller_apis(self):
141142

142143
resp = api.create_namespaced_replication_controller(
143144
body=rc_manifest, namespace='default')
144-
self.assertEqual('frontend', resp.metadata.name)
145+
self.assertEqual(name, resp.metadata.name)
145146
self.assertEqual(2, resp.spec.replicas)
146147

147148
resp = api.read_namespaced_replication_controller(
148-
name='frontend', namespace='default')
149-
self.assertEqual('frontend', resp.metadata.name)
149+
name=name, namespace='default')
150+
self.assertEqual(name, resp.metadata.name)
150151
self.assertEqual(2, resp.spec.replicas)
151152

152153
resp = api.delete_namespaced_replication_controller(
153-
name='frontend', body={}, namespace='default')
154+
name=name, body={}, namespace='default')
154155

155156

156157
@unittest.skipUnless(
@@ -159,11 +160,12 @@ def test_configmap_apis(self):
159160
client = api_client.ApiClient('http://127.0.0.1:8080/')
160161
api = core_v1_api.CoreV1Api(client)
161162

163+
name = 'test-configmap-' + str(uuid.uuid4())
162164
test_configmap = {
163165
"kind": "ConfigMap",
164166
"apiVersion": "v1",
165167
"metadata": {
166-
"name": "test-configmap",
168+
"name": name,
167169
},
168170
"data": {
169171
"config.json": "{\"command\":\"/usr/bin/mysqld_safe\"}",
@@ -174,18 +176,18 @@ def test_configmap_apis(self):
174176
resp = api.create_namespaced_config_map(
175177
body=test_configmap, namespace='default'
176178
)
177-
self.assertEqual('test-configmap', resp.metadata.name)
179+
self.assertEqual(name, resp.metadata.name)
178180

179181
resp = api.read_namespaced_config_map(
180-
name='test-configmap', namespace='default')
181-
self.assertEqual('test-configmap', resp.metadata.name)
182+
name=name, namespace='default')
183+
self.assertEqual(name, resp.metadata.name)
182184

183185
test_configmap['data']['config.json'] = "{}"
184186
resp = api.patch_namespaced_config_map(
185-
name='test-configmap', namespace='default', body=test_configmap)
187+
name=name, namespace='default', body=test_configmap)
186188

187189
resp = api.delete_namespaced_config_map(
188-
name='test-configmap', body={}, namespace='default')
190+
name=name, body={}, namespace='default')
189191

190192
resp = api.list_namespaced_config_map('kube-system', pretty=True)
191193
self.assertEqual([], resp.items)

0 commit comments

Comments
 (0)