particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Leveraging koji.fixEncoding() and cleaned up spacing

Browse source
This commit is contained in:
Joel Vasallo 2016-06-10 23:36:49 -05:00 • committed by Mike McLean
parent 3d37674b23
commit f0918c7941
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hub/kojihub.py
View file

@ -2665,7 +2665,7 @@ def lookup_name(table, info, strict=False, create=False):
elif isinstance(info, str):
q = """SELECT id,name FROM %s WHERE name=%%(info)s""" % table
elif isinstance(info, unicode):
info = info.encode('UTF-8')
info = koji.fixEncoding(info)
q = """SELECT id,name FROM %s WHERE name=%%(info)s""" % table
else:
raise koji.GenericError, 'invalid type for id lookup: %s' % type(info)

6
tests/test_hub/test_cg_importer.py
View file

@ -10,7 +10,7 @@ from koji import GenericError
class TestCGImporter(unittest.TestCase):
TMP_PATH = os.path.join(os.path.dirname(__file__), 'tmptest')
def setUp(self):
if not os.path.exists(self.TMP_PATH):
os.mkdir(self.TMP_PATH)
@ -20,8 +20,6 @@ class TestCGImporter(unittest.TestCase):
shutil.rmtree(self.TMP_PATH)
def test_basic_instantiation(self):
# TODO -- this doesn't make sense. A query with no arguments should
# probably raise an exception saying "this doesn't make sense."
kojihub.CG_Importer() # No exception!
def test_get_metadata_is_instance(self):
@ -131,4 +129,4 @@ class TestCGImporter(unittest.TestCase):
build.return_value = self.TMP_PATH
x = kojihub.CG_Importer()
x.get_metadata('default.json', 'cg_importer_json')
x.import_metadata()
x.import_metadata()