From 895d6d7c9690d098b50709ddebe54293c9b7e33f Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 18 Sep 2011 23:05:05 +0200 Subject: [PATCH] [tests] db: move etpConst['keywords'] setup at the end of setUp method --- libraries/tests/db.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/tests/db.py b/libraries/tests/db.py index 605da79ed..0d77da5c1 100644 --- a/libraries/tests/db.py +++ b/libraries/tests/db.py @@ -20,12 +20,6 @@ import entropy.tools class EntropyRepositoryTest(unittest.TestCase): def setUp(self): - # since package files have been produced on amd64, add the same - # arch to etpConst['keywords'] to avoid atomMatch failures on x86 - # and arm/other arches. - self._original_keywords = etpConst['keywords'].copy() - etpConst['keywords'].add("~amd64") - etpConst['keywords'].add("amd64") sys.stdout.write("%s called\n" % (self,)) sys.stdout.flush() self.Client = Client(installed_repo = -1, indexing = False, @@ -41,6 +35,12 @@ class EntropyRepositoryTest(unittest.TestCase): # GenericRepository supports package masking if this property is set self.test_db2.enable_mask_filter = True self._settings = SystemSettings() + # since package files have been produced on amd64, add the same + # arch to etpConst['keywords'] to avoid atomMatch failures on x86 + # and arm/other arches. + self._original_keywords = etpConst['keywords'].copy() + etpConst['keywords'].add("~amd64") + etpConst['keywords'].add("amd64") def tearDown(self): """