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

[Devan Franchini]

commit:     7428f47c435073a929f9a41f72a6bd8a675b631e
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 13:30:16 2015 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 13:30:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/layman.git/commit/?id=7428f47c

external.py: Adds db_type config option to tests which need it

The Overlay, DbBase, and DB would require the db_type config option
to be set. To prevent it from falling back on config option defaults
it's best to specify it.

 layman/tests/external.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/layman/tests/external.py b/layman/tests/external.py
index 0dad278..3e41bd1 100755
--- a/layman/tests/external.py
+++ b/layman/tests/external.py
@@ -154,6 +154,7 @@ class AddDeleteDB(unittest.TestCase):
 
         my_opts = {'installed'     : temp_xml_path,
                    'conf_type'     : ['make.conf', 'repos.conf'],
+                   'db_type'       : 'xml_db',
                    'nocheck'       : 'yes',
                    'make_conf'     : make_conf,
                    'repos_conf'    : repo_conf,
@@ -480,6 +481,7 @@ class FormatBranchCategory(unittest.TestCase):
     def _run(self, number):
         #config = {'output': Message()}
         config = BareConfig()
+
         # Discuss renaming files to "branch-%d.xml"
         filename1 = os.path.join(HERE, 'testfiles',
                 'subpath-%d.xml' % number)
@@ -554,7 +556,7 @@ class OverlayObjTest(unittest.TestCase):
         overlays = document.findall('overlay') + document.findall('repo')
         output = Message()
 
-        ovl_a = Overlay({'output': output}, overlays[0])
+        ovl_a = Overlay({'output': output, 'db_type': 'xml_db'}, 
xml=overlays[0])
         self.assertEqual(ovl_a.name, 'wrobel')
         self.assertEqual(ovl_a.is_official(), True)
         url = ['https://overlays.gentoo.org/svn/dev/wrobel']
@@ -563,7 +565,7 @@ class OverlayObjTest(unittest.TestCase):
         self.assertEqual(ovl_a.descriptions, ['Test'])
         self.assertEqual(ovl_a.priority, 10)
 
-        ovl_b = Overlay({'output': output}, overlays[1])
+        ovl_b = Overlay({'output': output, 'db_type': 'xml_db'}, 
xml=overlays[1])
         self.assertEqual(ovl_b.is_official(), False)
 
 
@@ -572,7 +574,7 @@ class OverlayObjTest(unittest.TestCase):
         overlays = document.findall('overlay') + document.findall('repo')
         output = Message()
 
-        ovl = Overlay({'output': output}, overlays[0])
+        ovl = Overlay({'output': output, 'db_type': 'xml_db'}, xml=overlays[0])
         test_infostr = 'wrobel\n~~~~~~\nSource  : '\
                        'https://overlays.gentoo.org/svn/dev/wrobel\nContact '\
                        ': nob...@gentoo.org\nType    : Subversion; Priority: '\
@@ -586,7 +588,7 @@ class OverlayObjTest(unittest.TestCase):
         overlays = document.findall('overlay') + document.findall('repo')
         output = Message()
 
-        ovl = Overlay({'output': output}, overlays[0])
+        ovl = Overlay({'output': output, 'db_type': 'xml_db'}, xml=overlays[0])
         test_short_list = 'wrobel                    [Subversion] '\
                           '(https://o.g.o/svn/dev/wrobel         )'
         self.assertEqual(ovl.short_list(80).decode('utf-8'), test_short_list)