Repository: incubator-slider Updated Branches: refs/heads/feature/python_unittests f6f639df5 -> 1425f76a0
Test Commit 7 Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/1425f76a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/1425f76a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/1425f76a Branch: refs/heads/feature/python_unittests Commit: 1425f76a098c3a650aae340db633b0146dd7b2a9 Parents: f6f639d Author: Sumit Mohanty <[email protected]> Authored: Sun Nov 9 08:53:18 2014 -0800 Committer: Sumit Mohanty <[email protected]> Committed: Sun Nov 9 08:53:18 2014 -0800 ---------------------------------------------------------------------- slider-agent/src/test/python/agent/TestGrep.py | 10 ++++++++-- slider-agent/src/test/python/agent/TestPythonExecutor.py | 1 + .../test/python/resource_management/TestContentSources.py | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1425f76a/slider-agent/src/test/python/agent/TestGrep.py ---------------------------------------------------------------------- diff --git a/slider-agent/src/test/python/agent/TestGrep.py b/slider-agent/src/test/python/agent/TestGrep.py index bd9e437..c11a6e4 100644 --- a/slider-agent/src/test/python/agent/TestGrep.py +++ b/slider-agent/src/test/python/agent/TestGrep.py @@ -23,6 +23,8 @@ from Grep import Grep import socket import os, sys import logging +import platform +IS_WINDOWS = platform.system() == "Windows" class TestGrep(TestCase): @@ -32,8 +34,12 @@ class TestGrep(TestCase): grep = Grep() def setUp(self): - self.string_good = open('agent' + os.sep + 'dummy_output_good.txt', 'r').read().replace("\n", os.linesep) - self.string_bad = open('agent' + os.sep + 'dummy_output_error.txt', 'r').read().replace("\n", os.linesep) + if IS_WINDOWS: + self.string_good = open('agent' + os.sep + 'dummy_output_good.txt', 'r').read().replace("\r\n", os.linesep) + self.string_bad = open('agent' + os.sep + 'dummy_output_error.txt', 'r').read().replace("\r\n", os.linesep) + else: + self.string_good = open('agent' + os.sep + 'dummy_output_good.txt', 'r').read().replace("\n", os.linesep) + self.string_bad = open('agent' + os.sep + 'dummy_output_error.txt', 'r').read().replace("\n", os.linesep) pass def test_grep_many_lines(self): http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1425f76a/slider-agent/src/test/python/agent/TestPythonExecutor.py ---------------------------------------------------------------------- diff --git a/slider-agent/src/test/python/agent/TestPythonExecutor.py b/slider-agent/src/test/python/agent/TestPythonExecutor.py index 5451e65..6506758 100644 --- a/slider-agent/src/test/python/agent/TestPythonExecutor.py +++ b/slider-agent/src/test/python/agent/TestPythonExecutor.py @@ -119,6 +119,7 @@ class TestPythonExecutor(TestCase): self.assertEquals(2, len(os_env_copy_mock.return_value)) def test_execution_results(self): + self.assertEqual.__self__.maxDiff = None subproc_mock = self.Subprocess_mockup() executor = PythonExecutor("/tmp", AgentConfig("", ""), self.agentToggleLogger) _, tmpoutfile = tempfile.mkstemp() http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/1425f76a/slider-agent/src/test/python/resource_management/TestContentSources.py ---------------------------------------------------------------------- diff --git a/slider-agent/src/test/python/resource_management/TestContentSources.py b/slider-agent/src/test/python/resource_management/TestContentSources.py index 841b72a..28d7435 100644 --- a/slider-agent/src/test/python/resource_management/TestContentSources.py +++ b/slider-agent/src/test/python/resource_management/TestContentSources.py @@ -134,12 +134,12 @@ class TestContentSources(TestCase): self.assertEqual(open_mock.call_count, 1) if IS_WINDOWS: - open_mock.assert_called_with('/base/templates\\test.j2', 'rb') + open_mock.assert_called_with('/base\\templates\\test.j2', 'rb') else: open_mock.assert_called_with('/base/templates/test.j2', 'rb') self.assertEqual(getmtime_mock.call_count, 1) if IS_WINDOWS: - getmtime_mock.assert_called_with('/base/templates\\test.j2') + getmtime_mock.assert_called_with('/base\\templates\\test.j2') else: getmtime_mock.assert_called_with('/base/templates/test.j2')
