[gentoo-commits] proj/gentoopm:master commit in: gentoopm/tests/

["Michał Górny" <mgorny@gentoo.org>]

commit:     96d43547ff234a34aa2c8dff8c981662d5cd5e5d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 08:50:26 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 08:50:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=96d43547

Tests: keep real package names in separate module.

---
 gentoopm/tests/__init__.py |   15 +++++++++++++++
 gentoopm/tests/atom.py     |    9 ++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/gentoopm/tests/__init__.py b/gentoopm/tests/__init__.py
index 40f0b75..f430917 100644
--- a/gentoopm/tests/__init__.py
+++ b/gentoopm/tests/__init__.py
@@ -36,3 +36,18 @@ class PMTestLoader(unittest.TestLoader):
 		if isinstance(mod, basestring):
 			mod = __import__(mod, fromlist=['.'], level=-1)
 		return unittest.TestLoader.loadTestsFromModule(self, mod)
+
+class PackageNames(object):
+	"""
+	A container for package names used in tests. Supposed to allow simple
+	switch to another packages when one of them stops to work.
+	"""
+
+	single = 'portage'
+	""" Incomplete atom matching a single package. """
+
+	single_complete = 'sys-apps/portage'
+	""" Complete atom matching a single package. """
+
+	multiple = 'pms'
+	""" Incomplete atom matching multiple packages. """

diff --git a/gentoopm/tests/atom.py b/gentoopm/tests/atom.py
index bee882d..53e7045 100644
--- a/gentoopm/tests/atom.py
+++ b/gentoopm/tests/atom.py
@@ -4,12 +4,12 @@
 # Released under the terms of the 2-clause BSD license.
 
 from gentoopm.exceptions import InvalidAtomStringError, AmbiguousPackageSetError
-from gentoopm.tests import PMTestCase
+from gentoopm.tests import PMTestCase, PackageNames
 
 class UserSpecifiedAtomTestCase(PMTestCase):
 	def setUp(self):
-		self._incomplete_atom = self.pm.Atom('portage')
-		self._complete_atom = self.pm.Atom('sys-apps/portage')
+		self._incomplete_atom = self.pm.Atom(PackageNames.single)
+		self._complete_atom = self.pm.Atom(PackageNames.single_complete)
 		self._associated_atom = self._complete_atom.get_associated(self.pm.stack)
 
 	def test_invalid_atoms(self):
@@ -42,8 +42,7 @@ class UserSpecifiedAtomTestCase(PMTestCase):
 		self.assertEqual(a.associated, True)
 
 	def test_ambiguous_atom_association(self):
-		# XXX: risky
-		ia = self.pm.Atom('pms')
+		ia = self.pm.Atom(PackageNames.multiple)
 		self.assertRaises(AmbiguousPackageSetError, ia.get_associated,
 				self.pm.stack)