Skip to content

Commit 1d3cd13

Browse files
mbohloolmbohlool
authored
Merge pull request kubernetes-client#115 from dims/add-more-e2e-tests
Refactor tests
2 parents 3b4aec6 + 6330141 commit 1d3cd13

File tree

4 files changed

+176
-119
lines changed

4 files changed

+176
-119
lines changed

‎kubernetes/e2e_test/base.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Licensed under the Apache License, Version 2.0 (the "License"); you may
2+
# not use this file except in compliance with the License. You may obtain
3+
# a copy of the License at
4+
#
5+
# http://www.apache.org/licenses/LICENSE-2.0
6+
#
7+
# Unless required by applicable law or agreed to in writing, software
8+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
9+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
10+
# License for the specific language governing permissions and limitations
11+
# under the License.
12+
13+
import urllib3
14+
15+
16+
def is_k8s_running():
17+
try:
18+
urllib3.PoolManager().request('GET', '127.0.0.1:8080')
19+
return True
20+
except urllib3.exceptions.HTTPError:
21+
return False

‎kubernetes/e2e_test/test_batch.py

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# -*- coding: utf-8 -*-
2+
3+
# Licensed under the Apache License, Version 2.0 (the "License"); you may
4+
# not use this file except in compliance with the License. You may obtain
5+
# a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12+
# License for the specific language governing permissions and limitations
13+
# under the License.
14+
15+
import unittest
16+
import uuid
17+
18+
from kubernetes.client import api_client
19+
from kubernetes.client.apis import batch_v1_api
20+
from kubernetes.e2e_test import base
21+
22+
23+
class TestClientBatch(unittest.TestCase):
24+
@unittest.skipUnless(
25+
base.is_k8s_running(), "Kubernetes is not available")
26+
def test_job_apis(self):
27+
client = api_client.ApiClient('http://127.0.0.1:8080/')
28+
api = batch_v1_api.BatchV1Api(client)
29+
30+
name = 'test-job-' + str(uuid.uuid4())
31+
job_manifest = {
32+
'kind': 'Job',
33+
'spec': {
34+
'template':
35+
{'spec':
36+
{'containers': [
37+
{'image': 'busybox',
38+
'name': name,
39+
'command': ["sh", "-c", "sleep 5"]
40+
}],
41+
'restartPolicy': 'Never'},
42+
'metadata': {'name': name}}},
43+
'apiVersion': 'batch/v1',
44+
'metadata': {'name': name}}
45+
46+
resp = api.create_namespaced_job(
47+
body=job_manifest, namespace='default')
48+
self.assertEqual(name, resp.metadata.name)
49+
50+
resp = api.read_namespaced_job(
51+
name=name, namespace='default')
52+
self.assertEqual(name, resp.metadata.name)
53+
54+
resp = api.delete_namespaced_job(
55+
name=name, body={}, namespace='default')

‎kubernetes/e2e_test/test_client.py

Lines changed: 7 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -12,95 +12,17 @@
1212
# License for the specific language governing permissions and limitations
1313
# under the License.
1414

15-
"""
16-
test_client
17-
----------------------------------
18-
19-
Tests for `client` module. Deploy Kubernetes using:
20-
http://kubernetes.io/docs/getting-started-guides/docker/
21-
22-
and then run this test
23-
"""
24-
2515
import unittest
26-
import urllib3
2716
import uuid
28-
import yaml
2917

3018
from kubernetes.client import api_client
3119
from kubernetes.client.apis import core_v1_api
32-
from kubernetes.client.apis import extensions_v1beta1_api
33-
34-
35-
def _is_k8s_running():
36-
try:
37-
urllib3.PoolManager().request('GET', '127.0.0.1:8080')
38-
return True
39-
except urllib3.exceptions.HTTPError:
40-
return False
20+
from kubernetes.e2e_test import base
4121

4222

4323
class TestClient(unittest.TestCase):
4424
@unittest.skipUnless(
45-
_is_k8s_running(), "Kubernetes is not available")
46-
def test_read_namespaces(self):
47-
client = api_client.ApiClient('http://127.0.0.1:8080/')
48-
api = core_v1_api.CoreV1Api(client)
49-
50-
expected_namespaces = ('default', 'kube-system')
51-
for ns in expected_namespaces:
52-
api.read_namespace(name=ns)
53-
54-
@unittest.skipUnless(
55-
_is_k8s_running(), "Kubernetes is not available")
56-
def test_read_services(self):
57-
client = api_client.ApiClient('http://127.0.0.1:8080/')
58-
api = core_v1_api.CoreV1Api(client)
59-
60-
expected_services = ('kubernetes',)
61-
for service in expected_services:
62-
api.read_namespaced_service(service, 'default')
63-
64-
@unittest.skipUnless(
65-
_is_k8s_running(), "Kubernetes is not available")
66-
def test_list_endpoints(self):
67-
client = api_client.ApiClient('http://127.0.0.1:8080/')
68-
api = core_v1_api.CoreV1Api(client)
69-
70-
endpoints = api.list_endpoints_for_all_namespaces()
71-
self.assertTrue(len(endpoints.items) > 0)
72-
73-
@unittest.skipUnless(
74-
_is_k8s_running(), "Kubernetes is not available")
75-
def test_create_deployment(self):
76-
client = api_client.ApiClient('http://127.0.0.1:8080/')
77-
api = extensions_v1beta1_api.ExtensionsV1beta1Api(client)
78-
name = 'nginx-deployment-' + str(uuid.uuid4())
79-
deployment = '''apiVersion: extensions/v1beta1
80-
kind: Deployment
81-
metadata:
82-
name: %s
83-
spec:
84-
replicas: 3
85-
template:
86-
metadata:
87-
labels:
88-
app: nginx
89-
spec:
90-
containers:
91-
- name: nginx
92-
image: nginx:1.7.9
93-
ports:
94-
- containerPort: 80
95-
'''
96-
resp = api.create_namespaced_deployment(
97-
body=yaml.load(deployment % name),
98-
namespace="default")
99-
resp = api.read_namespaced_deployment(name, 'default')
100-
self.assertIsNotNone(resp)
101-
102-
@unittest.skipUnless(
103-
_is_k8s_running(), "Kubernetes is not available")
25+
base.is_k8s_running(), "Kubernetes is not available")
10426
def test_pod_apis(self):
10527
client = api_client.ApiClient('http://127.0.0.1:8080/')
10628
api = core_v1_api.CoreV1Api(client)
@@ -129,7 +51,7 @@ def test_pod_apis(self):
12951
namespace='default')
13052

13153
@unittest.skipUnless(
132-
_is_k8s_running(), "Kubernetes is not available")
54+
base.is_k8s_running(), "Kubernetes is not available")
13355
def test_service_apis(self):
13456
client = api_client.ApiClient('http://127.0.0.1:8080/')
13557
api = core_v1_api.CoreV1Api(client)
@@ -170,7 +92,7 @@ def test_service_apis(self):
17092
namespace='default')
17193

17294
@unittest.skipUnless(
173-
_is_k8s_running(), "Kubernetes is not available")
95+
base.is_k8s_running(), "Kubernetes is not available")
17496
def test_replication_controller_apis(self):
17597
client = api_client.ApiClient('http://127.0.0.1:8080/')
17698
api = core_v1_api.CoreV1Api(client)
@@ -205,7 +127,7 @@ def test_replication_controller_apis(self):
205127
name=name, body={}, namespace='default')
206128

207129
@unittest.skipUnless(
208-
_is_k8s_running(), "Kubernetes is not available")
130+
base.is_k8s_running(), "Kubernetes is not available")
209131
def test_configmap_apis(self):
210132
client = api_client.ApiClient('http://127.0.0.1:8080/')
211133
api = core_v1_api.CoreV1Api(client)
@@ -243,46 +165,12 @@ def test_configmap_apis(self):
243165
self.assertEqual([], resp.items)
244166

245167
@unittest.skipUnless(
246-
_is_k8s_running(), "Kubernetes is not available")
168+
base.is_k8s_running(), "Kubernetes is not available")
247169
def test_node_apis(self):
248170
client = api_client.ApiClient('http://127.0.0.1:8080/')
249171
api = core_v1_api.CoreV1Api(client)
250172

251173
for item in api.list_node().items:
252174
node = api.read_node(name=item.metadata.name)
253175
self.assertTrue(len(node.metadata.labels) > 0)
254-
self.assertTrue(isinstance(node.metadata.labels, dict))
255-
256-
@unittest.skipUnless(
257-
_is_k8s_running(), "Kubernetes is not available")
258-
def test_create_daemonset(self):
259-
client = api_client.ApiClient('http://127.0.0.1:8080/')
260-
api = extensions_v1beta1_api.ExtensionsV1beta1Api(client)
261-
name = 'nginx-app-' + str(uuid.uuid4())
262-
daemonset = {
263-
'apiVersion': 'extensions/v1beta1',
264-
'kind': 'DaemonSet',
265-
'metadata': {
266-
'labels': {'app': 'nginx'},
267-
'name': '%s' % name,
268-
},
269-
'spec': {
270-
'template': {
271-
'metadata': {
272-
'labels': {'app': 'nginx'},
273-
'name': name},
274-
'spec': {
275-
'containers': [
276-
{'name': 'nginx-app',
277-
'image': 'nginx:1.10'},
278-
],
279-
},
280-
},
281-
'updateStrategy': {
282-
'type': 'RollingUpdate',
283-
},
284-
}
285-
}
286-
resp = api.create_namespaced_daemon_set('default', body=daemonset)
287-
resp = api.read_namespaced_daemon_set(name, 'default')
288-
self.assertIsNotNone(resp)
176+
self.assertTrue(isinstance(node.metadata.labels, dict))

‎kubernetes/e2e_test/test_extensions.py

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# -*- coding: utf-8 -*-
2+
3+
# Licensed under the Apache License, Version 2.0 (the "License"); you may
4+
# not use this file except in compliance with the License. You may obtain
5+
# a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12+
# License for the specific language governing permissions and limitations
13+
# under the License.
14+
15+
import unittest
16+
import uuid
17+
import yaml
18+
19+
from kubernetes.client import api_client
20+
from kubernetes.client.apis import extensions_v1beta1_api
21+
from kubernetes.client.models import v1_delete_options
22+
from kubernetes.e2e_test import base
23+
24+
25+
class TestClientExtensions(unittest.TestCase):
26+
@unittest.skipUnless(
27+
base.is_k8s_running(), "Kubernetes is not available")
28+
def test_create_deployment(self):
29+
client = api_client.ApiClient('http://127.0.0.1:8080/')
30+
api = extensions_v1beta1_api.ExtensionsV1beta1Api(client)
31+
name = 'nginx-deployment-' + str(uuid.uuid4())
32+
deployment = '''apiVersion: extensions/v1beta1
33+
kind: Deployment
34+
metadata:
35+
name: %s
36+
spec:
37+
replicas: 3
38+
template:
39+
metadata:
40+
labels:
41+
app: nginx
42+
spec:
43+
containers:
44+
- name: nginx
45+
image: nginx:1.7.9
46+
ports:
47+
- containerPort: 80
48+
'''
49+
resp = api.create_namespaced_deployment(
50+
body=yaml.load(deployment % name),
51+
namespace="default")
52+
resp = api.read_namespaced_deployment(name, 'default')
53+
self.assertIsNotNone(resp)
54+
55+
options = v1_delete_options.V1DeleteOptions()
56+
resp = api.delete_namespaced_deployment(name, 'default', body=options)
57+
58+
@unittest.skipUnless(
59+
base.is_k8s_running(), "Kubernetes is not available")
60+
def test_create_daemonset(self):
61+
client = api_client.ApiClient('http://127.0.0.1:8080/')
62+
api = extensions_v1beta1_api.ExtensionsV1beta1Api(client)
63+
name = 'nginx-app-' + str(uuid.uuid4())
64+
daemonset = {
65+
'apiVersion': 'extensions/v1beta1',
66+
'kind': 'DaemonSet',
67+
'metadata': {
68+
'labels': {'app': 'nginx'},
69+
'name': '%s' % name,
70+
},
71+
'spec': {
72+
'template': {
73+
'metadata': {
74+
'labels': {'app': 'nginx'},
75+
'name': name},
76+
'spec': {
77+
'containers': [
78+
{'name': 'nginx-app',
79+
'image': 'nginx:1.10'},
80+
],
81+
},
82+
},
83+
'updateStrategy': {
84+
'type': 'RollingUpdate',
85+
},
86+
}
87+
}
88+
resp = api.create_namespaced_daemon_set('default', body=daemonset)
89+
resp = api.read_namespaced_daemon_set(name, 'default')
90+
self.assertIsNotNone(resp)
91+
92+
options = v1_delete_options.V1DeleteOptions()
93+
resp = api.delete_namespaced_daemon_set(name, 'default', body=options)

0 commit comments

Comments
 (0)