diff --git a/kubernetes/e2e_test/test_batch.py b/kubernetes/e2e_test/test_batch.py index a8ea590db..d68c80854 100644 --- a/kubernetes/e2e_test/test_batch.py +++ b/kubernetes/e2e_test/test_batch.py @@ -26,7 +26,6 @@ class TestClientBatch(unittest.TestCase): def setUpClass(cls): cls.config = base.get_e2e_configuration() - def test_job_apis(self): client = api_client.ApiClient(configuration=self.config) api = batch_v1_api.BatchV1Api(client) @@ -56,4 +55,4 @@ class TestClientBatch(unittest.TestCase): self.assertEqual(name, resp.metadata.name) resp = api.delete_namespaced_job( - name=name, body={}, namespace='default') \ No newline at end of file + name=name, namespace='default', propagation_policy='Background') diff --git a/kubernetes/e2e_test/test_client.py b/kubernetes/e2e_test/test_client.py index 1034f0ef0..eed3c909e 100644 --- a/kubernetes/e2e_test/test_client.py +++ b/kubernetes/e2e_test/test_client.py @@ -35,6 +35,7 @@ if six.PY3: else: import httplib + def short_uuid(): id = str(uuid.uuid4()) return id[-12:] @@ -60,6 +61,7 @@ def manifest_with_command(name, command): } } + class TestClient(unittest.TestCase): @classmethod @@ -71,7 +73,8 @@ class TestClient(unittest.TestCase): api = core_v1_api.CoreV1Api(client) name = 'busybox-test-' + short_uuid() - pod_manifest = manifest_with_command(name, "while true;do date;sleep 5; done") + pod_manifest = manifest_with_command( + name, "while true;do date;sleep 5; done") # wait for the default service account to be created timeout = time.time() + 30 @@ -84,9 +87,10 @@ class TestClient(unittest.TestCase): namespace='default') except ApiException as e: if (six.PY3 and e.status != HTTPStatus.NOT_FOUND) or ( - six.PY3 is False and e.status != httplib.NOT_FOUND): + six.PY3 is False and e.status != httplib.NOT_FOUND): print('error: %s' % e) - self.fail(msg="unexpected error getting default service account") + self.fail( + msg="unexpected error getting default service account") print('default service not found yet: %s' % e) time.sleep(1) continue @@ -111,25 +115,25 @@ class TestClient(unittest.TestCase): '-c', 'for i in $(seq 1 3); do date; done'] resp = stream(api.connect_get_namespaced_pod_exec, name, 'default', - command=exec_command, - stderr=False, stdin=False, - stdout=True, tty=False) + command=exec_command, + stderr=False, stdin=False, + stdout=True, tty=False) print('EXEC response : %s' % resp) self.assertEqual(3, len(resp.splitlines())) exec_command = 'uptime' resp = stream(api.connect_post_namespaced_pod_exec, name, 'default', - command=exec_command, - stderr=False, stdin=False, - stdout=True, tty=False) + command=exec_command, + stderr=False, stdin=False, + stdout=True, tty=False) print('EXEC response : %s' % resp) self.assertEqual(1, len(resp.splitlines())) resp = stream(api.connect_post_namespaced_pod_exec, name, 'default', - command='/bin/sh', - stderr=True, stdin=True, - stdout=True, tty=False, - _preload_content=False) + command='/bin/sh', + stderr=True, stdin=True, + stdout=True, tty=False, + _preload_content=False) resp.write_stdin("echo test string 1\n") line = resp.readline_stdout(timeout=5) self.assertFalse(resp.peek_stderr()) @@ -157,7 +161,8 @@ class TestClient(unittest.TestCase): api = core_v1_api.CoreV1Api(client) name = 'busybox-test-' + short_uuid() - pod_manifest = manifest_with_command(name, "while true;do date;sleep 5; done") + pod_manifest = manifest_with_command( + name, "while true;do date;sleep 5; done") # wait for the default service account to be created timeout = time.time() + 30 @@ -171,9 +176,10 @@ class TestClient(unittest.TestCase): namespace='default') except ApiException as e: if (six.PY3 and e.status != HTTPStatus.NOT_FOUND) or ( - six.PY3 is False and e.status != httplib.NOT_FOUND): + six.PY3 is False and e.status != httplib.NOT_FOUND): print('error: %s' % e) - self.fail(msg="unexpected error getting default service account") + self.fail( + msg="unexpected error getting default service account") print('default service not found yet: %s' % e) time.sleep(1) continue @@ -201,11 +207,16 @@ class TestClient(unittest.TestCase): (["/bin/sh", "-c", "ls /"], 0) ) for command, value in commands_expected_values: - client = stream(api.connect_get_namespaced_pod_exec, name, 'default', - command=command, - stderr=True, stdin=False, - stdout=True, tty=False, - _preload_content=False) + client = stream( + api.connect_get_namespaced_pod_exec, + name, + 'default', + command=command, + stderr=True, + stdin=False, + stdout=True, + tty=False, + _preload_content=False) self.assertIsNone(client.returncode) client.run_forever(timeout=10) @@ -337,7 +348,8 @@ class TestClient(unittest.TestCase): for sock in (sock1234, sock1235): self.assertTrue(pf.connected) - sent = b'Another test using fileno %s' % str(sock.fileno()).encode() + sent = b'Another test using fileno %s' % str( + sock.fileno()).encode() sock.sendall(sent) reply = b'' while True: @@ -361,7 +373,7 @@ class TestClient(unittest.TestCase): client = api_client.ApiClient(configuration=self.config) api = core_v1_api.CoreV1Api(client) - name = 'portforward-http-' + short_uuid() + name = 'portforward-http-' + short_uuid() pod_manifest = { 'apiVersion': 'v1', 'kind': 'Pod', @@ -404,7 +416,8 @@ class TestClient(unittest.TestCase): socket_create_connection = socket.create_connection try: socket.create_connection = kubernetes_create_connection - response = urllib_request.urlopen('http://%s.default.kubernetes/' % name) + response = urllib_request.urlopen( + 'http://%s.default.kubernetes/' % name) html = response.read().decode('utf-8') finally: socket.create_connection = socket_create_connection @@ -485,7 +498,7 @@ class TestClient(unittest.TestCase): self.assertEqual(2, resp.spec.replicas) resp = api.delete_namespaced_replication_controller( - name=name, body={}, namespace='default') + name=name, namespace='default', propagation_policy='Background') def test_configmap_apis(self): client = api_client.ApiClient(configuration=self.config) @@ -521,7 +534,8 @@ class TestClient(unittest.TestCase): resp = api.delete_namespaced_config_map( name=name, body={}, namespace='default') - resp = api.list_namespaced_config_map('default', pretty=True, label_selector="e2e-tests=true") + resp = api.list_namespaced_config_map( + 'default', pretty=True, label_selector="e2e-tests=true") self.assertEqual([], resp.items) def test_node_apis(self): diff --git a/kubernetes/e2e_test/test_utils.py b/kubernetes/e2e_test/test_utils.py index 05a056c5f..73d1a0c62 100644 --- a/kubernetes/e2e_test/test_utils.py +++ b/kubernetes/e2e_test/test_utils.py @@ -31,7 +31,9 @@ class TestUtils(unittest.TestCase): cls.test_namespace = "e2e-test-utils" k8s_client = client.api_client.ApiClient(configuration=cls.config) core_v1 = client.CoreV1Api(api_client=k8s_client) - body = client.V1Namespace(metadata=client.V1ObjectMeta(name=cls.test_namespace)) + body = client.V1Namespace( + metadata=client.V1ObjectMeta( + name=cls.test_namespace)) core_v1.create_namespace(body=body) @classmethod @@ -304,7 +306,7 @@ class TestUtils(unittest.TestCase): name="mock", namespace="default") self.assertIsNotNone(ctr) core_api.delete_namespaced_replication_controller( - name="mock", namespace="default", body={}) + name="mock", namespace="default", propagation_policy="Background") core_api.delete_namespaced_service(name="mock", namespace="default", body={}) @@ -362,7 +364,7 @@ class TestUtils(unittest.TestCase): name="mock-2", namespace="default") self.assertIsNotNone(ctr) core_api.delete_namespaced_replication_controller( - name="mock-2", namespace="default", body={}) + name="mock-2", namespace="default", propagation_policy="Background") core_api.delete_namespaced_service(name="mock-2", namespace="default", body={}) @@ -396,7 +398,7 @@ class TestUtils(unittest.TestCase): def test_create_namespaced_apps_deployment_from_yaml(self): """ Should be able to create an apps/v1beta1 deployment - in a test namespace. + in a test namespace. """ k8s_client = client.api_client.ApiClient(configuration=self.config) utils.create_from_yaml(