From fdba33c5e88477d6dcdd58fabe1d62ffee55c5ff Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: May 07 2018 06:58:57 +0000 Subject: [PATCH 1/2] Fix test due to rpkg uses getpass.getuser Since PR https://pagure.io/rpkg/pull-request/311, rpkg uses getpass.getuser, this patch fixes a test for that change. Signed-off-by: Chenxiong Qi --- diff --git a/test/test_commands.py b/test/test_commands.py index ac85fc3..36ef3d7 100644 --- a/test/test_commands.py +++ b/test/test_commands.py @@ -130,15 +130,12 @@ class TestLoadUser(CommandTestCase): @patch('os.path.expanduser') @patch('os.path.exists') - @patch('os.getuid') - @patch('pwd.getpwuid') - def test_fall_back_to_super_load_user( - self, getpwuid, getuid, exists, expanduser): + @patch('getpass.getuser') + def test_fall_back_to_super_load_user(self, getuser, exists, expanduser): exists.return_value = False - getpwuid.return_value = ('someone', None) self.cmd.load_user() - self.assertEqual('someone', self.cmd._user) + self.assertEqual(getuser.return_value, self.cmd._user) class GetBodhiVersion(unittest.TestCase): From 5446155a5cfb2e2b5017be67bdce92c240a0c0e3 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: May 07 2018 07:02:44 +0000 Subject: [PATCH 2/2] Allow running tests against specified rpkg With this change, it is possible to run tests like this PYTHONPATH=/path/to/rpkg/ tox Signed-off-by: Chenxiong Qi --- diff --git a/tox.ini b/tox.ini index 9541c0e..fdb9934 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,7 @@ envlist = py26,py27,py36,flake8 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/tests-requirements.txt +passenv=PYTHONPATH commands = {toxinidir}/pip-pycurl nosetests {posargs} @@ -17,4 +18,4 @@ commands = [testenv:flake8] skip_install = True deps = flake8 == 3.5.0 -commands = flake8 fedpkg/ test/ \ No newline at end of file +commands = flake8 fedpkg/ test/