From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 929E71381F3 for ; Mon, 1 Jul 2013 22:04:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20F9EE0AB8; Mon, 1 Jul 2013 22:04:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9449DE0AB8 for ; Mon, 1 Jul 2013 22:04:14 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B87133E740 for ; Mon, 1 Jul 2013 22:04:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 22A90E468F for ; Mon, 1 Jul 2013 22:04:12 +0000 (UTC) From: "Jauhien Piatlicki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jauhien Piatlicki" Message-ID: <1372716302.02af1bb5bce3f4764fb076281122a82c317d99a6.jauhien@gentoo> Subject: [gentoo-commits] proj/g-sorcery:master commit in: g_sorcery/, tests/dummy_backend/, tests/ X-VCS-Repository: proj/g-sorcery X-VCS-Files: g_sorcery/g_sorcery.py tests/dummy_backend/backend.py tests/test_g_sorcery.py X-VCS-Directories: g_sorcery/ tests/dummy_backend/ tests/ X-VCS-Committer: jauhien X-VCS-Committer-Name: Jauhien Piatlicki X-VCS-Revision: 02af1bb5bce3f4764fb076281122a82c317d99a6 X-VCS-Branch: master Date: Mon, 1 Jul 2013 22:04:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 86e451fe-2817-4f2b-bf8e-66f45f749b55 X-Archives-Hash: e98d29e2b5d8d69976538f2e6595a322 commit: 02af1bb5bce3f4764fb076281122a82c317d99a6 Author: Jauhien Piatlicki (jauhien) gmail com> AuthorDate: Mon Jul 1 22:05:02 2013 +0000 Commit: Jauhien Piatlicki gmail com> CommitDate: Mon Jul 1 22:05:02 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=02af1bb5 g_sorcery/g_sorcery: backend selection --- g_sorcery/g_sorcery.py | 3 ++- tests/dummy_backend/backend.py | 12 +++++++++++- tests/test_g_sorcery.py | 10 ++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/g_sorcery/g_sorcery.py b/g_sorcery/g_sorcery.py index c815ec9..d6ca0e2 100644 --- a/g_sorcery/g_sorcery.py +++ b/g_sorcery/g_sorcery.py @@ -39,7 +39,8 @@ def main(): except FileJSONError as e: sys.stderr.write('g-sorcery error in config file for ' + name + ': ' + str(e) + '\n') return -1 - pass + backend = get_backend(config['package']) + print(backend.test()) def get_backend(package): try: diff --git a/tests/dummy_backend/backend.py b/tests/dummy_backend/backend.py index b23785c..8e43a4f 100644 --- a/tests/dummy_backend/backend.py +++ b/tests/dummy_backend/backend.py @@ -1,4 +1,14 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -instance = 'test' +class Test: + def __init__(self): + self.tst = 'test backend' + + def test(self): + return('test') + + def __eq__(self, other): + return self.tst == other.tst + +instance = Test() diff --git a/tests/test_g_sorcery.py b/tests/test_g_sorcery.py index ece991d..4b18474 100644 --- a/tests/test_g_sorcery.py +++ b/tests/test_g_sorcery.py @@ -46,6 +46,15 @@ class TestBin(unittest.TestCase): self.assertRaises(subprocess.CalledProcessError, subprocess.check_output, './g-empty') os.chdir(prev) + def test_config(self): + prev = os.getcwd() + os.chdir(self.tempdir.name) + os.system('ln -s ' + self.binary + ' g-dummy') + os.system('echo {\\"package\\": \\"dummy_backend\\"} > ./g-dummy.json') + self.assertEqual(subprocess.check_output('./g-dummy').decode("utf-8")[:-1], + dummyBackend.instance.test()) + os.chdir(prev) + class TestGSorcery(unittest.TestCase): def setUp(self): self.tempdir = tempfile.TemporaryDirectory() @@ -62,5 +71,6 @@ def suite(): suite.addTest(TestBin('test_g_sorcery')) suite.addTest(TestBin('test_nonexistent_backend')) suite.addTest(TestBin('test_empty_config')) + suite.addTest(TestBin('test_config')) suite.addTest(TestGSorcery('test_get_backend')) return suite