sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[tests] db: do not fail on atomMatch() due to different arch (fixes tests on ARM)

Browse Source
This commit is contained in:
Fabio Erculiani
2011-09-18 22:42:47 +02:00
parent a089127bd5
commit 0feacbf90d
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/tests/db.py
View File

@@ -510,9 +510,9 @@ class EntropyRepositoryTest(unittest.TestCase):
pkg_name = _misc.get_test_package_name4()
self.assertEqual(nf_match, self.test_db.atomMatch("slib"))
self.assertEqual(f_match,
self.test_db.atomMatch(pkg_name))
self.test_db.atomMatch(pkg_name, maskFilter=False))
self.assertEqual(f_match,
self.test_db.atomMatch(pkg_atom))
self.test_db.atomMatch(pkg_atom, maskFilter=False))
# test package masking
plug_id = self.client_sysset_plugin_id
@@ -523,12 +523,14 @@ class EntropyRepositoryTest(unittest.TestCase):
self._settings['live_packagemasking']['mask_matches'].add(
f_match_mask)
masking_validation.clear()
self.assertEqual((-1, 1), self.test_db.atomMatch(pkg_atom))
self.assertEqual((-1, 1), self.test_db.atomMatch(
pkg_atom, maskFilter=False))
self._settings['live_packagemasking']['mask_matches'].discard(
f_match_mask)
masking_validation.clear()
self.assertNotEqual((-1, 1), self.test_db.atomMatch(pkg_atom))
self.assertNotEqual((-1, 1), self.test_db.atomMatch(pkg_atom,
maskFilter=False))
def test_db_insert_compare_match_tag(self):
@@ -546,9 +548,12 @@ class EntropyRepositoryTest(unittest.TestCase):
for atom, pkg_id, branch in self.test_db.listAllPackages():
pkg_key = entropy.dep.dep_getkey(atom)
self.assertEqual(f_match, self.test_db.atomMatch(pkg_key))
self.assertEqual(f_match, self.test_db.atomMatch(atom))
self.assertEqual(f_match, self.test_db.atomMatch("~"+atom))
self.assertEqual(f_match, self.test_db.atomMatch(pkg_key,
maskFilter=False))
self.assertEqual(f_match, self.test_db.atomMatch(atom,
maskFilter=False))
self.assertEqual(f_match, self.test_db.atomMatch("~"+atom,
maskFilter=False))
def test_db_multithread(self):