saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #45153 from terminalmage/fix-docker-unit-test

Browse source 
Update mocking in unit.grains.test_core.CoreGrainsTestCase.test_docker_virtual
This commit is contained in:
Erik Johnson 2017-12-24 09:23:41 -06:00 • committed by GitHub
commit 14c8979cb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/grains/test_core.py
View file

@ -700,7 +700,7 @@ SwapTotal: 4789244 kB'''
'10:memory{0}a_long_sha256sum'.format(cgroup_substr)
log.debug(
'Testing Docker cgroup substring \'%s\'', cgroup_substr)
with patch('salt.utils.fopen', mock_open(read_data=cgroup_data)):
with patch('salt.utils.files.fopen', mock_open(read_data=cgroup_data)):
self.assertEqual(
core._virtual({'kernel': 'Linux'}).get('virtual_subtype'),
'Docker'