diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-21 13:32:51 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-21 13:33:20 -0400 |
| commit | 22016ee593d6047855964734a17120d2aea6b5a5 (patch) | |
| tree | 92adbca098e89295d4217561ee53454134b781a2 /testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py | |
| parent | d6bf20100848dc61b971844e21d24da44b9f65f7 (diff) | |
| download | bcfg2-22016ee593d6047855964734a17120d2aea6b5a5.tar.gz bcfg2-22016ee593d6047855964734a17120d2aea6b5a5.tar.bz2 bcfg2-22016ee593d6047855964734a17120d2aea6b5a5.zip | |
lots of various py3k fixes
Diffstat (limited to 'testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py')
| -rw-r--r-- | testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py index f32da9c37..b737cfe1e 100644 --- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py +++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py @@ -4,8 +4,8 @@ import unittest import lxml.etree from mock import Mock, MagicMock, patch from Bcfg2.Client.Tools.POSIX.Device import * -from Test__init import get_posix_object -from Testbase import TestPOSIXTool +from .Test__init import get_posix_object +from .Testbase import TestPOSIXTool from .....common import * class TestPOSIXDevice(TestPOSIXTool): @@ -97,8 +97,8 @@ class TestPOSIXDevice(TestPOSIXTool): self.assertTrue(ptool.install(entry)) mock_exists.assert_called_with(entry, remove=True) mock_makedev.assert_called_with(0, 10) - mock_mknod.assert_called_with(entry.get("name"), - device_map[entry.get("dev_type")] | 0644, + mock_mknod.assert_called_with(entry.get("name"), # 0o644 + device_map[entry.get("dev_type")] | 420, mock_makedev.return_value) mock_install.assert_called_with(ptool, entry) @@ -127,6 +127,6 @@ class TestPOSIXDevice(TestPOSIXTool): self.assertTrue(ptool.install(entry)) mock_exists.assert_called_with(entry, remove=True) - mock_mknod.assert_called_with(entry.get("name"), - device_map[entry.get("dev_type")] | 0644) + mock_mknod.assert_called_with(entry.get("name"), # 0o644 + device_map[entry.get("dev_type")] | 420) mock_install.assert_called_with(ptool, entry) |