INFRA-947 - Parse v1 fiaas.yml to new model

fiaas · Sep 6, 2016 · 302e4b7 · 302e4b7
1 parent 0ebe8bc
commit 302e4b7
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/tests/k8s/test_deployer.py b/tests/k8s/test_deployer.py
@@ -4,10 +4,9 @@
 from pprint import pformat
 
 import pytest
-
 from k8s.models.common import ObjectMeta
-from k8s.models.pod import ContainerPort, Container, LocalObjectReference, Probe, HTTPGetAction, TCPSocketAction
 from k8s.models.deployment import Deployment, DeploymentSpec, LabelsSelector, PodTemplateSpec, PodSpec
+from k8s.models.pod import ContainerPort, Container, LocalObjectReference, Probe, HTTPGetAction, TCPSocketAction
 from util import get_vcr
 
 vcr = get_vcr(__file__)

diff --git a/tests/k8s/test_ingress.py b/tests/k8s/test_ingress.py
@@ -4,7 +4,6 @@
 from pprint import pformat
 
 import pytest
-
 from k8s.models.common import ObjectMeta
 from k8s.models.ingress import Ingress, IngressSpec, IngressRule, IngressBackend, HTTPIngressPath, HTTPIngressRuleValue
 from util import get_vcr

diff --git a/tests/k8s/test_pod.py b/tests/k8s/test_pod.py
@@ -4,7 +4,6 @@
 from pprint import pformat
 
 import pytest
-
 from k8s.models.common import ObjectMeta
 from k8s.models.pod import Pod, ContainerPort, Container, LocalObjectReference, PodSpec, Volume, VolumeMount, SecretVolumeSource
 from util import get_vcr

diff --git a/tests/k8s/test_replication_controller.py b/tests/k8s/test_replication_controller.py
@@ -4,7 +4,6 @@
 from pprint import pformat
 
 import pytest
-
 from k8s.models.common import ObjectMeta
 from k8s.models.pod import ContainerPort, Container, LocalObjectReference, Probe, HTTPGetAction, TCPSocketAction
 from k8s.models.replication_controller import ReplicationController, ReplicationControllerSpec, PodTemplateSpec, PodSpec

diff --git a/tests/k8s/test_service.py b/tests/k8s/test_service.py
@@ -1,12 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8
 
-import pytest
 import mock
-
+import pytest
+from k8s.client import NotFound
 from k8s.models.common import ObjectMeta
 from k8s.models.service import Service, ServicePort, ServiceSpec
-from k8s.client import NotFound
 from util import assert_any_call_with_useful_error_message
 
 SERVICE_NAMESPACE = 'my-namespace'