You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/11/09 16:43:34 UTC
incubator-slider git commit: Test Commit 2
Repository: incubator-slider
Updated Branches:
refs/heads/feature/python_unittests cd74189dd -> 0cc2a39fb
Test Commit 2
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0cc2a39f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0cc2a39f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0cc2a39f
Branch: refs/heads/feature/python_unittests
Commit: 0cc2a39fb7cbdbee267d0b8b9e83f739a93d58b4
Parents: cd74189
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sun Nov 9 07:43:28 2014 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sun Nov 9 07:43:28 2014 -0800
----------------------------------------------------------------------
slider-agent/src/test/python/agent/TestRegistration.py | 11 ++++++-----
.../resource_management/TestPropertiesFileResource.py | 5 +++--
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0cc2a39f/slider-agent/src/test/python/agent/TestRegistration.py
----------------------------------------------------------------------
diff --git a/slider-agent/src/test/python/agent/TestRegistration.py b/slider-agent/src/test/python/agent/TestRegistration.py
index c82d784..735fcc3 100644
--- a/slider-agent/src/test/python/agent/TestRegistration.py
+++ b/slider-agent/src/test/python/agent/TestRegistration.py
@@ -28,6 +28,7 @@ from mock.mock import MagicMock
from Register import Register
from Controller import State
from AgentConfig import AgentConfig
+import posixpath
class TestRegistration(TestCase):
@@ -53,11 +54,11 @@ class TestRegistration(TestCase):
self.assertEquals(data['tags'], "tag", "tags should be tag")
self.assertEquals(len(data), 10)
- self.assertEquals(os.path.join(tmpdir, "app/definition"), config.getResolvedPath("app_pkg_dir"))
- self.assertEquals(os.path.join(tmpdir, "app/install"), config.getResolvedPath("app_install_dir"))
- self.assertEquals(os.path.join(ver_dir, "."), config.getResolvedPath("app_log_dir"))
- self.assertEquals(os.path.join(ver_dir, "."), config.getResolvedPath("log_dir"))
- self.assertEquals(os.path.join(ver_dir, "."), config.getResolvedPath("app_task_dir"))
+ self.assertEquals(posixpath.join(tmpdir, "app/definition"), config.getResolvedPath("app_pkg_dir"))
+ self.assertEquals(posixpath.join(tmpdir, "app/install"), config.getResolvedPath("app_install_dir"))
+ self.assertEquals(posixpath.join(ver_dir, "."), config.getResolvedPath("app_log_dir"))
+ self.assertEquals(posixpath.join(ver_dir, "."), config.getResolvedPath("log_dir"))
+ self.assertEquals(posixpath.join(ver_dir, "."), config.getResolvedPath("app_task_dir"))
if __name__ == "__main__":
unittest.main()
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0cc2a39f/slider-agent/src/test/python/resource_management/TestPropertiesFileResource.py
----------------------------------------------------------------------
diff --git a/slider-agent/src/test/python/resource_management/TestPropertiesFileResource.py b/slider-agent/src/test/python/resource_management/TestPropertiesFileResource.py
index 6eb01cf..479c799 100644
--- a/slider-agent/src/test/python/resource_management/TestPropertiesFileResource.py
+++ b/slider-agent/src/test/python/resource_management/TestPropertiesFileResource.py
@@ -27,6 +27,7 @@ from mock.mock import patch, MagicMock
from resource_management.core import Environment
from resource_management.core.system import System
from resource_management.libraries import PropertiesFile
+import posixpath
@patch.object(System, "os_family", new='redhat')
class TestPropertiesFileResource(TestCase):
@@ -100,7 +101,7 @@ class TestPropertiesFileResource(TestCase):
properties={},
)
- open_mock.assert_called_with('/dir/and/dir/file.txt', 'wb')
+ open_mock.assert_called_with(os.path.join('/dir/and/dir', 'file.txt'), 'wb')
result_file.__enter__().write.assert_called_with(u'# Generated by Apache Slider. Some other day\n \n \n')
self.assertEqual(open_mock.call_count, 1)
ensure_mock.assert_called()
@@ -213,7 +214,7 @@ class TestPropertiesFileResource(TestCase):
)
result_file.read.assert_called()
- open_mock.assert_called_with('/dir1/new_file', 'wb')
+ open_mock.assert_called_with(os.path.join('/dir1','new_file'), 'wb')
result_file.__enter__().write.assert_called_with(u'# Generated by Apache Slider. 777\n \nproperty_1=value1\n \n')
self.assertEqual(open_mock.call_count, 2)
ensure_mock.assert_called()