From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Thu, 26 Jun 2014 07:01:18 +0000 (+0300)
Subject: ComponentTestBase: add check_files() method
X-Git-Tag: debian/0.6.23~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e7cb0dfa90aa34d7bf9d319d4a2abe45df3ff4f;p=tools%2Fgit-buildpackage.git

ComponentTestBase: add check_files() method

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---

diff --git a/tests/component/__init__.py b/tests/component/__init__.py
index 44a84e20..ae815775 100644
--- a/tests/component/__init__.py
+++ b/tests/component/__init__.py
@@ -125,6 +125,15 @@ class ComponentTestBase(object):
 
         self._capture_log(False)
 
+    @staticmethod
+    def check_files(reference, filelist):
+        """Compare two file lists"""
+        extra = set(filelist) - set(reference)
+        missing = set(reference) - set(filelist)
+        assert_msg = "Unexpected files: %s, Missing files: %s" % \
+                        (list(extra), list(missing))
+        assert not extra and not missing, assert_msg
+
     @classmethod
     def _check_repo_state(cls, repo, current_branch, branches, files=None):
         """Check that repository is clean and given branches exist"""
@@ -148,10 +157,7 @@ class ComponentTestBase(object):
                 for dirname in dirnames:
                     local.add(os.path.relpath(os.path.join(dirpath, dirname),
                                               repo.path) + '/')
-            extra = local - set(files)
-            ok_(not extra, "Unexpected files in repo: %s" % list(extra))
-            missing = set(files) - local
-            ok_(not missing, "Files missing from repo: %s" % list(missing))
+            cls.check_files(files, local)
 
     def _capture_log(self, capture=True):
         """ Capture log"""