Adds more docker py test

Addes more docker py test
Optimize test to import images from cache
Rename test class and dir for python unittest framework

Signed-off-by: Sujil02 <sushah@redhat.com>

6 files changed, 0 insertions, 308 deletions

diff --git a/test/dockerpy/README.md b/test/dockerpy/README.md
deleted file mode 100644
index 32e426d58..000000000
--- a/test/dockerpy/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Dockerpy regression test
-
-Python test suite to validate Podman endpoints using dockerpy library
-
-Running tests
-=============
-To run the tests locally in your sandbox:
-
-#### Run the entire test
-
-```
-sudo PYTHONPATH=/usr/bin/python python -m dockerpy.images
-```
-
-Passing the -v option to your test script will instruct unittest.main() to enable a higher level of verbosity, and produce detailed output:
-
-```
-sudo PYTHONPATH=/usr/bin/python python -m unittest -v dockerpy.images
-```
-#### Run a specific test class
-
-```
-sudo PYTHONPATH=/usr/bin/python python -m unittest -v dockerpy.images.TestImages
-```
-
-#### Run a specific test within the test class
-
-```
-sudo PYTHONPATH=/usr/bin/python python -m unittest -v dockerpy.images.TestImages.test_list_images
-```
diff --git a/test/dockerpy/__init__.py b/test/dockerpy/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/test/dockerpy/__init__.py
+++ /dev/null
diff --git a/test/dockerpy/common.py b/test/dockerpy/common.py
deleted file mode 100644
index fdacb49be..000000000
--- a/test/dockerpy/common.py
+++ /dev/null
@@ -1,68 +0,0 @@
-import docker
-import subprocess
-import os
-import sys
-import time
-from docker import Client
-from . import constant
-
-alpineDict = {
-      "name":        "docker.io/library/alpine:latest",
-		"shortName":   "alpine",
-		"tarballName": "alpine.tar"}
-
-def get_client():
-   client = docker.Client(base_url="http://localhost:8080",timeout=15)
-   return client
-
-client = get_client()
-
-def podman():
-    binary = os.getenv("PODMAN_BINARY")
-    if binary is None:
-        binary = "bin/podman"
-    return binary
-
-def restore_image_from_cache():
-   client.load_image(constant.ImageCacheDir+alpineDict["tarballName"])
-
-def run_top_container():
-   client.pull(constant.ALPINE)
-   c = client.create_container(constant.ALPINE,name=constant.TOP)
-   client.start(container=c.get("Id"))
-
-def enable_sock(TestClass):
-   TestClass.podman = subprocess.Popen(
-      [
-            podman(), "system", "service", "tcp:localhost:8080",
-            "--log-level=debug", "--time=0"
-      ],
-      shell=False,
-      stdin=subprocess.DEVNULL,
-      stdout=subprocess.DEVNULL,
-      stderr=subprocess.DEVNULL,
-   )
-   time.sleep(2)
-
-def terminate_connection(TestClass):
-   TestClass.podman.terminate()
-   stdout, stderr = TestClass.podman.communicate(timeout=0.5)
-   if stdout:
-      print("\nService Stdout:\n" + stdout.decode('utf-8'))
-   if stderr:
-      print("\nService Stderr:\n" + stderr.decode('utf-8'))
-
-   if TestClass.podman.returncode > 0:
-      sys.stderr.write("podman exited with error code {}\n".format(
-            TestClass.podman.returncode))
-      sys.exit(2)
-
-def remove_all_containers():
-   containers = client.containers(quiet=True)
-   for c in containers:
-      client.remove_container(container=c.get("Id"), force=True)
-
-def remove_all_images():
-   allImages = client.images()
-   for image in allImages:
-      client.remove_image(image,force=True)
diff --git a/test/dockerpy/constant.py b/test/dockerpy/constant.py
deleted file mode 100644
index 8a3f1d984..000000000
--- a/test/dockerpy/constant.py
+++ /dev/null
@@ -1,13 +0,0 @@
-BB                = "docker.io/library/busybox:latest"
-NGINX             = "docker.io/library/nginx:latest"
-ALPINE            = "docker.io/library/alpine:latest"
-ALPINE_SHORTNAME  = "alpine"
-ALPINELISTTAG     = "docker.io/library/alpine:3.10.2"
-ALPINELISTDIGEST  = "docker.io/library/alpine@sha256:72c42ed48c3a2db31b7dafe17d275b634664a708d901ec9fd57b1529280f01fb"
-ALPINEAMD64DIGEST = "docker.io/library/alpine@sha256:acd3ca9941a85e8ed16515bfc5328e4e2f8c128caa72959a58a127b7801ee01f"
-ALPINEAMD64ID     = "961769676411f082461f9ef46626dd7a2d1e2b2a38e6a44364bcbecf51e66dd4"
-ALPINEARM64DIGEST = "docker.io/library/alpine@sha256:db7f3dcef3d586f7dd123f107c93d7911515a5991c4b9e51fa2a43e46335a43e"
-ALPINEARM64ID     = "915beeae46751fc564998c79e73a1026542e945ca4f73dc841d09ccc6c2c0672"
-infra             = "k8s.gcr.io/pause:3.2"
-TOP               = "top"
-ImageCacheDir = "/tmp/podman/imagecachedir"
diff --git a/test/dockerpy/containers.py b/test/dockerpy/containers.py
deleted file mode 100644
index d70ec932c..000000000
--- a/test/dockerpy/containers.py
+++ /dev/null
@@ -1,46 +0,0 @@
-
-import unittest
-import docker
-import requests
-import os
-from docker import Client
-from . import constant
-from . import common
-
-client = common.get_client()
-
-class TestContainers(unittest.TestCase):
-
-    podman = None
-
-    def setUp(self):
-        super().setUp()
-        common.run_top_container()
-
-    def tearDown(self):
-        common.remove_all_containers()
-        common.remove_all_images()
-        return super().tearDown()
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        common.enable_sock(cls)
-
-    @classmethod
-    def tearDownClass(cls):
-        common.terminate_connection(cls)
-        return super().tearDownClass()
-
-    def test_inspect_container(self):
-        # Inspect bogus container
-        with self.assertRaises(requests.HTTPError):
-            client.inspect_container("dummy")
-        # Inspect valid container
-        container = client.inspect_container(constant.TOP)
-        self.assertIn(constant.TOP , container["Name"])
-
-
-if __name__ == '__main__':
-    # Setup temporary space
-    unittest.main()
diff --git a/test/dockerpy/images.py b/test/dockerpy/images.py
deleted file mode 100644
index 1e07d25c7..000000000
--- a/test/dockerpy/images.py
+++ /dev/null
@@ -1,151 +0,0 @@
-
-import unittest
-import docker
-import requests
-import os
-from docker import Client
-from . import constant
-from . import common
-
-client = common.get_client()
-
-class TestImages(unittest.TestCase):
-
-    podman = None
-    def setUp(self):
-        super().setUp()
-        client.pull(constant.ALPINE)
-
-    def tearDown(self):
-        common.remove_all_images()
-        return super().tearDown()
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        common.enable_sock(cls)
-
-
-    @classmethod
-    def tearDownClass(cls):
-        common.terminate_connection(cls)
-        return super().tearDownClass()
-
-
-# Inspect Image
-
-    def test_inspect_image(self):
-        # Check for error with wrong image name
-        with self.assertRaises(requests.HTTPError):
-            client.inspect_image("dummy")
-        alpine_image = client.inspect_image(constant.ALPINE)
-        self.assertIn(constant.ALPINE, alpine_image["RepoTags"])
-
-# Tag Image
-
-    # Validates if invalid image name is given a bad response is encountered.
-    def test_tag_invalid_image(self):
-        with self.assertRaises(requests.HTTPError):
-            client.tag("dummy","demo")
-
-
-
-    #  Validates if the image is tagged successfully.
-    def test_tag_valid_image(self):
-        client.tag(constant.ALPINE,"demo",constant.ALPINE_SHORTNAME)
-        alpine_image = client.inspect_image(constant.ALPINE)
-        for x in alpine_image["RepoTags"]:
-            if("demo:alpine" in x):
-                self.assertTrue
-        self.assertFalse
-
-    # Validates if name updates when the image is retagged.
-    @unittest.skip("dosent work now")
-    def test_retag_valid_image(self):
-        client.tag(constant.ALPINE_SHORTNAME, "demo","rename")
-        alpine_image = client.inspect_image(constant.ALPINE)
-        self.assertNotIn("demo:test", alpine_image["RepoTags"])
-
-# List Image
-    # List All Images
-    def test_list_images(self):
-        allImages = client.images()
-        self.assertEqual(len(allImages), 1)
-        # Add more images
-        client.pull(constant.BB)
-        client.pull(constant.NGINX)
-        allImages = client.images()
-        self.assertEqual(len(allImages) , 3)
-
-
-    # List images with filter
-        filters = {'reference':'alpine'}
-        allImages = client.images(filters = filters)
-        self.assertEqual(len(allImages) , 1)
-
-# Search Image
-    def test_search_image(self):
-        response = client.search("alpine")
-        for i in response:
-            # Alpine found
-            if "docker.io/library/alpine" in i["Name"]:
-                self.assertTrue
-        self.assertFalse
-
-# Image Exist (No docker-py support yet)
-
-# Remove Image
-    def test_remove_image(self):
-        # Check for error with wrong image name
-        with self.assertRaises(requests.HTTPError):
-            client.remove_image("dummy")
-        allImages = client.images()
-        self.assertEqual(len(allImages) , 1)
-        alpine_image = client.inspect_image(constant.ALPINE)
-        client.remove_image(alpine_image)
-        allImages = client.images()
-        self.assertEqual(len(allImages) , 0)
-
-# Image History
-    def test_image_history(self):
-        # Check for error with wrong image name
-        with self.assertRaises(requests.HTTPError):
-            client.remove_image("dummy")
-        imageHistory = client.history(constant.ALPINE)
-        alpine_image = client.inspect_image(constant.ALPINE)
-        for h in imageHistory:
-            if h["Id"] in alpine_image["Id"]:
-                self.assertTrue
-        self.assertFalse
-
-# Prune Image (No docker-py support yet)
-
-# Export Image
-
-    def test_export_image(self):
-        client.pull(constant.BB)
-        file = os.path.join(constant.ImageCacheDir , "busybox.tar")
-        if not os.path.exists(constant.ImageCacheDir):
-            os.makedirs(constant.ImageCacheDir)
-        # Check for error with wrong image name
-        with self.assertRaises(requests.HTTPError):
-            client.get_image("dummy")
-        response = client.get_image(constant.BB)
-        image_tar = open(file,mode="wb")
-        image_tar.write(response.data)
-        image_tar.close()
-        os.stat(file)
-
-# Import|Load Image
-
-    def test_import_image(self):
-        allImages = client.images()
-        self.assertEqual(len(allImages), 1)
-        file = os.path.join(constant.ImageCacheDir , "busybox.tar")
-        client.import_image_from_file(filename=file)
-        allImages = client.images()
-        self.assertEqual(len(allImages), 2)
-
-if __name__ == '__main__':
-    # Setup temporary space
-    unittest.main()