Merge pull request #1619 from coreos-inc/disable-aci-tests

Disable ACI tests when build under Docker

Dockerfile

@@ -111,6 +111,7 @@ ADD . .
 # Run the tests
 ARG RUN_TESTS=true
 ENV RUN_TESTS ${RUN_TESTS}
+ENV RUN_ACI_TESTS False
 
 RUN if [ "$RUN_TESTS" = true ]; then \
       TEST=true venv/bin/python -m unittest discover -f; \

test/registry_tests.py

@@ -11,7 +11,6 @@ import time
 import gpgme
 
 import Crypto.Random
-from cachetools import lru_cache
 from flask import request, jsonify
 from flask.blueprints import Blueprint
 from flask.ext.testing import LiveServerTestCase
@@ -1542,6 +1541,9 @@ class ACIConversionTests(RegistryTestCaseMixin, V1RegistryPushMixin, LiveServerT
 
 
   def test_basic_conversion(self):
+    if os.environ.get('RUN_ACI_TESTS') == 'False':
+      return
+
     initial_images = [
       {
         'id': 'initialid',
@@ -1621,6 +1623,9 @@ class ACIConversionTests(RegistryTestCaseMixin, V1RegistryPushMixin, LiveServerT
     self.fail('Derived image annotation not found in metadata')
 
   def test_conversion_different_tags(self):
+    if os.environ.get('RUN_ACI_TESTS') == 'False':
+      return
+
     initial_images = [
       {
         'id': 'initialid',
@@ -1644,6 +1649,9 @@ class ACIConversionTests(RegistryTestCaseMixin, V1RegistryPushMixin, LiveServerT
 
 
   def test_multilayer_conversion(self):
+    if os.environ.get('RUN_ACI_TESTS') == 'False':
+      return
+
     images = [
       {
         'id': 'baseid',