summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-11-12 11:16:43 -0800
committerJoffrey F <joffrey@docker.com>2015-11-12 11:21:37 -0800
commitc622ff64b902770da582a391346f70d642e652b8 (patch)
tree2cc5a3602b08c8fcb61f40ce47cae73147d715c6
parent6e73f04acc16f847c64a7d14cd9cdfd810b8a515 (diff)
downloaddocker-py-remove-ci-transition-files.tar.gz
Remove unused filesremove-ci-transition-files
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--tests/integration/__init__.py13
-rw-r--r--tests/integration_test.py4
2 files changed, 0 insertions, 17 deletions
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
index 20c0a0a..e69de29 100644
--- a/tests/integration/__init__.py
+++ b/tests/integration/__init__.py
@@ -1,13 +0,0 @@
-# flake8: noqa
-
-# FIXME: crutch while we transition to the new folder architecture
-# Remove imports when merged in master and Jenkins is updated to find the
-# tests in the new location.
-from .api_test import *
-from .build_test import *
-from .container_test import *
-from .exec_test import *
-from .image_test import *
-from .network_test import *
-from .regression_test import *
-from .volume_test import *
diff --git a/tests/integration_test.py b/tests/integration_test.py
deleted file mode 100644
index 73cbf93..0000000
--- a/tests/integration_test.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# FIXME: placeholder while we transition to the new folder architecture
-# Remove when merged in master and Jenkins is updated to find the tests
-# in the new location.
-from .integration import * # flake8: noqa