From bb2e2fbc6248617f86994e60b732b556ba0ca0ad Mon Sep 17 00:00:00 2001
From: Mikhail Gordeev <obirvalger@altlinux.org>
Date: Fri, 1 Nov 2019 15:30:53 +0300
Subject: [PATCH] Rename test images module and function

---
 cloud-build.py                                       | 4 ++--
 cloud_build/{test_images => image_tests}/__init__.py | 2 +-
 cloud_build/{test_images => image_tests}/docker.py   | 0
 cloud_build/{test_images => image_tests}/lxd.py      | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename cloud_build/{test_images => image_tests}/__init__.py (95%)
 rename cloud_build/{test_images => image_tests}/docker.py (100%)
 rename cloud_build/{test_images => image_tests}/lxd.py (100%)

diff --git a/cloud-build.py b/cloud-build.py
index df46a99..2dd131b 100755
--- a/cloud-build.py
+++ b/cloud-build.py
@@ -16,7 +16,7 @@ import sys
 
 import yaml
 
-from cloud_build.test_images import test_image
+import cloud_build.image_tests
 
 PROG = 'cloud-build'
 
@@ -492,7 +492,7 @@ Dir::Etc::preferencesparts "/var/empty";
                         self.copy_image(tarball, image_path)
                         for test in self.tests_by_image(image):
                             self.info(f'Test {image} {branch} {arch}')
-                            if not test_image(
+                            if not cloud_build.image_tests.test(
                                 image=image_path,
                                 branch=branch,
                                 arch=arch,
diff --git a/cloud_build/test_images/__init__.py b/cloud_build/image_tests/__init__.py
similarity index 95%
rename from cloud_build/test_images/__init__.py
rename to cloud_build/image_tests/__init__.py
index 6629b3d..9930534 100644
--- a/cloud_build/test_images/__init__.py
+++ b/cloud_build/image_tests/__init__.py
@@ -20,7 +20,7 @@ def pushtmpd():
         shutil.rmtree(tmpdir)
 
 
-def test_image(method, image, branch, arch):
+def test(method, image, branch, arch):
     if arch not in ['x86_64', 'i586']:
         return True
 
diff --git a/cloud_build/test_images/docker.py b/cloud_build/image_tests/docker.py
similarity index 100%
rename from cloud_build/test_images/docker.py
rename to cloud_build/image_tests/docker.py
diff --git a/cloud_build/test_images/lxd.py b/cloud_build/image_tests/lxd.py
similarity index 100%
rename from cloud_build/test_images/lxd.py
rename to cloud_build/image_tests/lxd.py