Skip failing tests on docker 1.10 (#641)

BZ#1330224 will never be fixed in 1.10

It causes failures in docker-1.10 but is fixed
in 1.12 (it was never a problem pre-1.10). The bug will
not be fixed in any RH build of docker-1.10, so let's just
skip it when encountered.

Signed-off-by: Ed Santiago <[email protected]>

Author: edsantiago

subtests/docker_cli/start/long_term_app.py

@@ -22,6 +22,7 @@ class long_term_app(short_term_app):
 
     def initialize(self):
         super(long_term_app, self).initialize()
+        self.skip_if_docker_1_10()
         kill_cmd = DockerCmd(self, "kill",
                              [self.sub_stuff["container"].long_id],
                              self.config['docker_run_timeout'])

subtests/docker_cli/start/rerun_long_term_app.py

@@ -16,6 +16,10 @@ class rerun_long_term_app(short_term_app):
     config_section = 'docker_cli/start/rerun_long_term_app'
     check_if_cmd_finished = False
 
+    def initialize(self):
+        super(rerun_long_term_app, self).initialize()
+        self.skip_if_docker_1_10()
+
     def outputgood(self):
         # Raise exception if problems found
         # but ignore expected error message

subtests/docker_cli/start/start.py

@@ -23,6 +23,8 @@
 from dockertest.output import OutputGood
 from dockertest.dockercmd import AsyncDockerCmd, DockerCmd
 from dockertest.containers import DockerContainers
+from dockertest.output import DockerVersion
+from dockertest.xceptions import DockerTestNAError
 from dockertest.images import DockerImage
 from dockertest import subtest
 from dockertest import config
@@ -124,6 +126,11 @@ def wait_for_container_death(self, container_obj):
         results = prep_changes.execute()
         return results.exit_status
 
+    @staticmethod
+    def skip_if_docker_1_10():
+        if DockerVersion().server.startswith("1.10"):
+            raise DockerTestNAError("rhbz#1330224 will not be fixed in 1.10")
+
 
 class short_term_app(start_base):
     config_section = 'docker_cli/start/short_term_app'