IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix unnecessary usrmerge assumptions

Browse Source 
On non-usrmerge systems (e.g., Debian), bash, mv, cp, cat, tail,
keyctl, and gzip live in /bin, not /usr/bin.

On usrmerge systems, /bin is a symlink to /usr/bin (or vice versa), so
this has no effect.

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Robbie Harwood
2019-04-10 17:25:37 -04:00
committed by Christian Heimes
parent 0ba25c7e68
commit 5ecede781b
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ipatests/test_ipalib/test_util.py
View File

@@ -14,12 +14,13 @@ from ipalib.util import get_pager
@pytest.mark.parametrize('pager,expected_result', [
# Valid values
('cat', '/usr/bin/cat'),
('/usr/bin/cat', '/usr/bin/cat'),
('cat', '/bin/cat'),
('/bin/cat', '/bin/cat'),
# Invalid values (wrong command, package is not installed, etc)
('cat_', None),
('', None)
])
def test_get_pager(pager, expected_result):
with mock.patch.dict(os.environ, {'PAGER': pager}):
assert get_pager() == expected_result
pager = get_pager()
assert(pager == expected_result or pager.endswith(expected_result))