Update tests to use buildout

slapos/recipe/build/tests.py

@@ -9,6 +9,8 @@ import stat
 import tempfile
 import unittest
 import zc.buildout.testing
+from zc.buildout.testing import buildoutTearDown
+from functools import wraps
 from subprocess import check_call, check_output, CalledProcessError
 from slapos.recipe.gitclone import GIT_CLONE_ERROR_MESSAGE, \
     GIT_CLONE_CACHE_ERROR_MESSAGE
@@ -28,6 +30,16 @@ def setUp(test):
   zc.buildout.testing.buildoutSetUp(test)
   zc.buildout.testing.install_develop('slapos.recipe.build', test)
 
+def with_buildout(wrapped):
+  def wrapper(self):
+    self.globs = {}
+    setUp(self)
+    try:
+      wrapped(self, **self.globs)
+    finally:
+      buildoutTearDown(self)
+  return wraps(wrapped)(wrapper)
+
 class GitCloneNonInformativeTests(unittest.TestCase):
 
   def setUp(self):
@@ -164,7 +176,8 @@ class GitCloneNonInformativeTests(unittest.TestCase):
     self.assertTrue(os.path.exists(git_repository_path))
     self.assertFalse(os.path.exists(bad_file_path), "pyc file not removed")
 
-  def test_clone_and_udpate_submodule(self):
+  @with_buildout
+  def test_clone_and_udpate_submodule(self, buildout, write, sample_buildout, **kw):
     """
     STEP I:
     Repositories status:  Main repo(M1) and Submodule repo (S1)
@@ -182,14 +195,20 @@ class GitCloneNonInformativeTests(unittest.TestCase):
     Install should be M3+S2
     """
     self.setUpSubmoduleRepository()
+
     # STEP I: Clone repositories in status M1 and S1 (M1---->S1)
-    recipe = self.makeGitCloneRecipe(
-      {
-        'repository': self.project_dir,
-      }
-    )
-    recipe.install()
-    main_repo_path = os.path.join(self.parts_directory_path, "test")
+    write(sample_buildout, 'buildout.cfg',
+"""
+[buildout]
+parts = git-clone
+
+[git-clone]
+recipe = slapos.recipe.build:gitclone
+repository = %s
+""" % self.project_dir)
+    check_call([buildout])
+
+    main_repo_path = os.path.join(sample_buildout, 'parts', 'git-clone')
     self.assertTrue(os.path.exists(main_repo_path))
     submodule_repo_path = os.path.join(main_repo_path, 'dir1',
                                        'submodule_repo')
@@ -211,13 +230,18 @@ class GitCloneNonInformativeTests(unittest.TestCase):
     # STEP II: Clone repositories in status M2 and S2 (M2---->S1)
     # Update the recipe with new revision which still point to the submodule
     # old revision
-    recipe = self.makeGitCloneRecipe(
-      {
-        'repository': self.project_dir,
-        'revision': str(self.getRepositoryHeadCommit(self.project_dir))
-      }
-    )
-    recipe.update()
+    write(sample_buildout, 'buildout.cfg',
+"""
+[buildout]
+parts = git-clone
+
+[git-clone]
+recipe = slapos.recipe.build:gitclone
+repository = %s
+revision = %s
+""" % (self.project_dir, str(self.getRepositoryHeadCommit(self.project_dir))))
+    check_call([buildout])
+
     self.assertTrue(os.path.exists(main_repo_path))
     # Check if the submodule is not empty
     self.assertTrue(os.listdir(submodule_repo_path))
@@ -236,13 +260,18 @@ class GitCloneNonInformativeTests(unittest.TestCase):
 
     # STEP III: Clone repositories in status M3 and S2 (M3---->S2)
     # Update the recipe with new revision which points to submodule new revision
-    recipe = self.makeGitCloneRecipe(
-      {
-        'repository': self.project_dir,
-        'revision': str(self.getRepositoryHeadCommit(self.project_dir))
-      }
-    )
-    recipe.update()
+    write(sample_buildout, 'buildout.cfg',
+"""
+[buildout]
+parts = git-clone
+
+[git-clone]
+recipe = slapos.recipe.build:gitclone
+repository = %s
+revision = %s
+""" % (self.project_dir, str(self.getRepositoryHeadCommit(self.project_dir))))
+    check_call([buildout])
+
     self.assertTrue(os.path.exists(main_repo_path))
     # Check if the submodule is not empty
     self.assertTrue(os.listdir(submodule_repo_path))