Skip to content

Commit

Permalink
Raise ValueError when command has incorrect type
Browse files Browse the repository at this point in the history 
Command arg should be a tuple or a list. Add raising exception
instead of omitting it.
  • Loading branch information
@prazumovsky
prazumovsky committed Sep 12, 2018
1 parent a392d85 commit 8650b60
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 218 deletions.
325 changes: 115 additions & 210 deletions tests/unit/test_service.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -547,33 +547,20 @@ def test_create_pod_with_incorrect_command(self):

self.k8s_client.generate_random_name = mock.MagicMock()
self.k8s_client.generate_random_name.return_value = "name"
self.k8s_client.create_pod(
ex = self.assertRaises(
ValueError,
self.k8s_client.create_pod,
image="test/image",
namespace="ns",
command="ls",
status_wait=False)
status_wait=False
)

expected = {
"apiVersion": "v1",
"kind": "Pod",
"metadata": {
"name": "name",
"labels": {
"role": "name"
}
},
"spec": {
"containers": [
{
"name": "name",
"image": "test/image"
}
]
}
}
self.client.create_namespaced_pod.assert_called_once_with(
body=expected,
namespace="ns"
self.assertEqual("'command' argument should be list or tuple type, "
"found <type 'str'>", str(ex))
self.assertEqual(
0,
self.client.create_namespaced_pod.call_count
)

def test_create_pod_with_sa(self):
Expand Down Expand Up @@ -892,47 +879,22 @@ def test_create_replication_controller_with_incorrect_command(self):

self.k8s_client.generate_random_name = mock.MagicMock()
self.k8s_client.generate_random_name.return_value = "name"
self.k8s_client.create_rc(
ex = self.assertRaises(
ValueError,
self.k8s_client.create_rc,
image="test/image",
replicas=2,
namespace="ns",
command="ls",
status_wait=False)
status_wait=False
)

expected = {
"apiVersion": "v1",
"kind": "ReplicationController",
"metadata": {
"name": "name",
},
"spec": {
"replicas": 2,
"selector": {
"app": mock.ANY
},
"template": {
"metadata": {
"name": "name",
"labels": {
"app": mock.ANY
}
},
"spec": {
"containers": [
{
"name": "name",
"image": "test/image"
}
]
}
}
}
}
(self.client.create_namespaced_replication_controller
.assert_called_once_with(
body=expected,
namespace="ns"
))
self.assertEqual("'command' argument should be list or tuple type, "
"found <type 'str'>", str(ex))
self.assertEqual(
0,
self.client.create_namespaced_replication_controller.call_count
)

def test_create_and_wait_replication_controller_success(self):
self.config_cls.reset_mock()
Expand Down Expand Up @@ -1262,52 +1224,22 @@ def test_create_replicaset_with_incorrect_command(self):

self.k8s_client.generate_random_name = mock.MagicMock()
self.k8s_client.generate_random_name.return_value = "name"
self.k8s_client.create_replicaset(
ex = self.assertRaises(
ValueError,
self.k8s_client.create_replicaset,
image="test/image",
replicas=2,
namespace="ns",
command="ls",
status_wait=False)
status_wait=False
)

expected = {
"apiVersion": "extensions/v1beta1",
"kind": "ReplicaSet",
"metadata": {
"name": "name",
"labels": {
"app": mock.ANY
}
},
"spec": {
"replicas": 2,
"selector": {
"matchLabels": {
"app": mock.ANY
}
},
"template": {
"metadata": {
"name": "name",
"labels": {
"app": mock.ANY
}
},
"spec": {
"containers": [
{
"name": "name",
"image": "test/image"
}
]
}
}
}
}
(self.client.create_namespaced_replica_set
.assert_called_once_with(
body=expected,
namespace="ns"
))
self.assertEqual("'command' argument should be list or tuple type, "
"found <type 'str'>", str(ex))
self.assertEqual(
0,
self.client.create_namespaced_replica_set.call_count
)

def test_create_and_wait_replicaset_success(self):
self.config_cls.reset_mock()
Expand Down Expand Up @@ -2022,47 +1954,72 @@ def test_create_deployment_with_incorrect_command(self):

self.k8s_client.generate_random_name = mock.MagicMock()
self.k8s_client.generate_random_name.return_value = "name"
self.k8s_client.create_deployment(
ex = self.assertRaises(
ValueError,
self.k8s_client.create_deployment,
image="test/image",
replicas=2,
namespace="ns",
command="ls",
status_wait=False)
status_wait=False
)

expected = {
"apiVersion": "extensions/v1beta1",
"kind": "Deployment",
"metadata": {
"name": "name",
"labels": {
"app": mock.ANY
}
},
"spec": {
"replicas": 2,
"template": {
"metadata": {
"name": "name",
"labels": {
"app": mock.ANY
}
},
"spec": {
"containers": [
{
"name": "name",
"image": "test/image"
}
]
}
}
}
}
(self.client.create_namespaced_deployment
.assert_called_once_with(
body=expected,
namespace="ns"
))
self.assertEqual("'command' argument should be list or tuple type, "
"found <type 'str'>", str(ex))
self.assertEqual(
0,
self.client.create_namespaced_deployment.call_count
)

def test_create_deployment_with_incorrect_env(self):
self.config_cls.reset_mock()
self.api_cls.reset_mock()
self.client_cls.reset_mock()

self.k8s_client.generate_random_name = mock.MagicMock()
self.k8s_client.generate_random_name.return_value = "name"
ex = self.assertRaises(
ValueError,
self.k8s_client.create_deployment,
image="test/image",
replicas=2,
namespace="ns",
command=["ls"],
env="VAR",
status_wait=False
)

self.assertEqual("'env' argument should be list or tuple type, "
"found <type 'str'>", str(ex))
self.assertEqual(
0,
self.client.create_namespaced_deployment.call_count
)

def test_create_deployment_with_incorrect_resources(self):
self.config_cls.reset_mock()
self.api_cls.reset_mock()
self.client_cls.reset_mock()

self.k8s_client.generate_random_name = mock.MagicMock()
self.k8s_client.generate_random_name.return_value = "name"
ex = self.assertRaises(
ValueError,
self.k8s_client.create_deployment,
image="test/image",
replicas=2,
namespace="ns",
command=["ls"],
resources=("limit", "unlimited"),
status_wait=False
)

self.assertEqual("'resources' argument should be dict type, found "
"<type 'tuple'>", str(ex))
self.assertEqual(
0,
self.client.create_namespaced_deployment.call_count
)

def test_create_and_wait_deployment_success(self):
self.config_cls.reset_mock()
Expand Down Expand Up @@ -2626,52 +2583,22 @@ def test_create_statefulset_with_incorrect_command(self):

self.k8s_client.generate_random_name = mock.MagicMock()
self.k8s_client.generate_random_name.return_value = "name"
self.k8s_client.create_statefulset(
ex = self.assertRaises(
ValueError,
self.k8s_client.create_statefulset,
image="test/image",
replicas=2,
namespace="ns",
command="ls",
status_wait=False)
status_wait=False
)

expected = {
"apiVersion": "apps/v1",
"kind": "StatefulSet",
"metadata": {
"name": "name",
"labels": {
"app": mock.ANY
}
},
"spec": {
"selector": {
"matchLabels": {
"app": mock.ANY
}
},
"replicas": 2,
"template": {
"metadata": {
"name": "name",
"labels": {
"app": mock.ANY
}
},
"spec": {
"containers": [
{
"image": "test/image",
"name": "name"
}
]
}
}
}
}
(self.client.create_namespaced_stateful_set
.assert_called_once_with(
body=expected,
namespace="ns"
))
self.assertEqual("'command' argument should be list or tuple type, "
"found <type 'str'>", str(ex))
self.assertEqual(
0,
self.client.create_namespaced_stateful_set.call_count
)

def test_create_and_wait_statefulset_success(self):
self.config_cls.reset_mock()
Expand Down Expand Up @@ -3349,43 +3276,21 @@ def test_create_daemonset_with_incorrect_command(self):

self.k8s_client.generate_random_name = mock.MagicMock()
self.k8s_client.generate_random_name.return_value = "name"
self.k8s_client.create_daemonset(
ex = self.assertRaises(
ValueError,
self.k8s_client.create_daemonset,
image="test/image",
namespace="ns",
command="ls",
node_labels=None,
status_wait=False)

expected = expected = {
"apiVersion": "extensions/v1beta1",
"kind": "DaemonSet",
"metadata": {
"name": "name"
},
"spec": {
"template": {
"metadata": {
"name": "name",
"labels": {
"app": mock.ANY
}
},
"spec": {
"containers": [
{
"image": "test/image",
"name": "name"
}
]
}
}
}
}
(self.client.create_namespaced_daemon_set
.assert_called_once_with(
body=expected,
namespace="ns"
))
status_wait=False
)
self.assertEqual("'command' argument should be list or tuple type, "
"found <type 'str'>", str(ex))
self.assertEqual(
0,
self.client.create_namespaced_daemon_set.call_count
)

def test_create_and_wait_daemonset_success_node_no_filter(self):
self.config_cls.reset_mock()
Expand Down
Loading

0 comments on commit 8650b60

Please sign in to comment.