diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2016-08-18 06:36:03 -0700 |
|---|---|---|
| committer | Brian Coca <bcoca@users.noreply.github.com> | 2016-08-18 09:36:03 -0400 |
| commit | bd31cc096af11ccbf203a34dda480909d7d38be9 (patch) | |
| tree | e53d440f34e0196bd06f8b059af4b2ed9441b46f /test/units | |
| parent | 9d29431661361edebe1c4f306bf95a0c7baa9eaa (diff) | |
| download | ansible-bd31cc096af11ccbf203a34dda480909d7d38be9.tar.gz | |
Fix facts.py for python3 (#17131)
* Fix facts.py for python3
* Update facts unittest to account for filepaths being byte strings
Diffstat (limited to 'test/units')
| -rw-r--r-- | test/units/module_utils/test_facts.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/units/module_utils/test_facts.py b/test/units/module_utils/test_facts.py index c2a47863de..2ccdc3fd07 100644 --- a/test/units/module_utils/test_facts.py +++ b/test/units/module_utils/test_facts.py @@ -170,7 +170,7 @@ class TestSunOSVirtual(BaseTestFactsPlatform): fact_class = facts.SunOSVirtual -LSBLK_OUTPUT = """ +LSBLK_OUTPUT = b""" /dev/sda /dev/sda1 32caaec3-ef40-4691-a3b6-438c3f9bc1c0 /dev/sda2 66Ojcd-ULtu-1cZa-Tywo-mx0d-RF4O-ysA9jK @@ -187,7 +187,7 @@ LSBLK_OUTPUT = """ /dev/mapper/docker-253:1-1050967-pool """ -LSBLK_OUTPUT_2 = """ +LSBLK_OUTPUT_2 = b""" /dev/sda /dev/sda1 32caaec3-ef40-4691-a3b6-438c3f9bc1c0 /dev/sda2 66Ojcd-ULtu-1cZa-Tywo-mx0d-RF4O-ysA9jK @@ -401,7 +401,7 @@ MTAB_ENTRIES = \ BIND_MOUNTS = ['/not/a/real/bind_mount'] -FINDMNT_OUTPUT = """ +FINDMNT_OUTPUT = b""" /sys sysfs sysfs rw,nosuid,nodev,noexec,relatime,seclabel /proc proc proc rw,nosuid,nodev,noexec,relatime /dev devtmpfs devtmpfs rw,nosuid,seclabel,size=8044400k,nr_inodes=2011100,mode=755 @@ -517,9 +517,9 @@ class TestFactsLinuxHardwareGetMountFacts(unittest.TestCase): lsblk_uuids = lh._lsblk_uuid() self.assertIsInstance(lsblk_uuids, dict) - self.assertIn('/dev/loop9', lsblk_uuids) - self.assertIn('/dev/sda1', lsblk_uuids) - self.assertEquals(lsblk_uuids['/dev/sda1'], '32caaec3-ef40-4691-a3b6-438c3f9bc1c0') + self.assertIn(b'/dev/loop9', lsblk_uuids) + self.assertIn(b'/dev/sda1', lsblk_uuids) + self.assertEquals(lsblk_uuids[b'/dev/sda1'], b'32caaec3-ef40-4691-a3b6-438c3f9bc1c0') @patch('ansible.module_utils.facts.LinuxHardware._run_lsblk', return_value=(37, LSBLK_OUTPUT,'')) def test_lsblk_uuid_non_zero(self, mock_run_lsblk): @@ -545,7 +545,7 @@ class TestFactsLinuxHardwareGetMountFacts(unittest.TestCase): lh = facts.LinuxHardware(module=module, load_on_init=False) lsblk_uuids = lh._lsblk_uuid() self.assertIsInstance(lsblk_uuids, dict) - self.assertIn('/dev/loop0', lsblk_uuids) - self.assertIn('/dev/sda1', lsblk_uuids) - self.assertEquals(lsblk_uuids['/dev/mapper/an-example-mapper with a space in the name'], '84639acb-013f-4d2f-9392-526a572b4373') - self.assertEquals(lsblk_uuids['/dev/sda1'], '32caaec3-ef40-4691-a3b6-438c3f9bc1c0') + self.assertIn(b'/dev/loop0', lsblk_uuids) + self.assertIn(b'/dev/sda1', lsblk_uuids) + self.assertEquals(lsblk_uuids[b'/dev/mapper/an-example-mapper with a space in the name'], b'84639acb-013f-4d2f-9392-526a572b4373') + self.assertEquals(lsblk_uuids[b'/dev/sda1'], b'32caaec3-ef40-4691-a3b6-438c3f9bc1c0') |