From 9de298a7b88f7f36aec4c9344356a935c67cfeb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joshua=20Ismael=20Haase=20Hern=C3=A1ndez?=
 <hahj87@gmail.com>
Date: Mon, 14 Feb 2011 23:27:46 -0600
Subject: * Added test for generate_exclude_list_from_blacklist * Fixed listado
 to strip spaces

---
 filter.py                              |  1 -
 pato2.py                               |  2 +-
 test/blacklist_sample                  |  2 ++
 test/test_pkginfo_from_rsync_output.py | 17 +++++++++++------
 4 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 test/blacklist_sample

diff --git a/filter.py b/filter.py
index f8182e3..f91ec68 100644
--- a/filter.py
+++ b/filter.py
@@ -107,7 +107,6 @@ def generate_exclude_list_from_blacklist(packages_iterable, blacklisted_names,
             a.append(package["location"])
 
     if debug:
-        printf(a)
         return a
     try:
         fsock = open(exclude_file,"w")
diff --git a/pato2.py b/pato2.py
index e32a4dd..5bc97a9 100644
--- a/pato2.py
+++ b/pato2.py
@@ -42,7 +42,7 @@ def listado(filename_):
 	archivo = open(filename_,"r")
 	lista   = archivo.read().split("\n")
 	archivo.close()
-	return [pkg.split(":")[0] for pkg in lista if pkg]
+	return [pkg.split(":")[0].rstrip() for pkg in lista if pkg]
 
 def db(repo_,arch_):
 	"""Construye un nombre para sincronizar una base de datos."""
diff --git a/test/blacklist_sample b/test/blacklist_sample
new file mode 100644
index 0000000..2a02af6
--- /dev/null
+++ b/test/blacklist_sample
@@ -0,0 +1,2 @@
+alex:alex-libre: Aquí va un comentario
+gmime22 ::Non free dependencies
\ No newline at end of file
diff --git a/test/test_pkginfo_from_rsync_output.py b/test/test_pkginfo_from_rsync_output.py
index 5ed5dd8..aca49e8 100644
--- a/test/test_pkginfo_from_rsync_output.py
+++ b/test/test_pkginfo_from_rsync_output.py
@@ -47,14 +47,19 @@ class pkginfoFromRsyncOutput(unittest.TestCase):
             self.assertIsInstance(pkg,Package)
 
     def testPackageInfo(self): 
-        if self.pkglist:
-            first_package=self.pkglist[0]
-        else:
-            self.fail(self.pkglist)
-        self.assertEqual(first_package,example_package_list[0])
+        if not self.pkglist:
+            self.fail("Pkglist doesn't exist: " + str(self.pkglist))
+        self.assertEqual(self.pkglist,example_package_list)
 
 class generateRsyncBlacklist(unittest.TestCase):
     """ Test Blacklist generation """
-  
+    def testListado(self):
+        self.assertEqual(listado("blacklist_sample"),["alex","gmime22"])
+
+    def testExcludeFiles(self):
+        a=generate_exclude_list_from_blacklist(example_package_list,listado("blacklist_sample"),debug=True)
+        b=[example_package_list[0]["location"],example_package_list[2]["location"]]
+        self.assertEqual(a,b)
+
 if __name__ == "__main__":
     unittest.main()
-- 
cgit v1.2.3