Repository: ambari Updated Branches: refs/heads/trunk 1a0055ab4 -> 902e62f21
AMBARI-5984. Ganglia directory customization failing on trunk on perf cluster (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/902e62f2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/902e62f2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/902e62f2 Branch: refs/heads/trunk Commit: 902e62f21c178f690975f1886a9530cd83e5e21e Parents: 1a0055a Author: Andrew Onishuk <[email protected]> Authored: Mon Jun 2 17:57:38 2014 +0300 Committer: Andrew Onishuk <[email protected]> Committed: Mon Jun 2 17:57:38 2014 +0300 ---------------------------------------------------------------------- .../src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py | 5 ----- .../src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py | 5 ----- 2 files changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/902e62f2/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py index e4a82ac..494c3dc 100644 --- a/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py +++ b/ambari-server/src/test/python/stacks/1.3.2/GANGLIA/test_ganglia_server.py @@ -21,8 +21,6 @@ limitations under the License. from stacks.utils.RMFTestCase import * from mock.mock import MagicMock, call, patch -@patch("os.path.exists", new = MagicMock(return_value=False)) -@patch("os.path.islink", new = MagicMock(return_value=False)) class TestGangliaServer(RMFTestCase): def test_configure_default(self): @@ -184,9 +182,6 @@ class TestGangliaServer(RMFTestCase): mode = 0755, ) self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', - action = ['delete'], - ) - self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', owner = 'nobody', group = 'nobody', recursive = True, http://git-wip-us.apache.org/repos/asf/ambari/blob/902e62f2/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py index afd5f51..a8ad60b 100644 --- a/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py +++ b/ambari-server/src/test/python/stacks/2.0.6/GANGLIA/test_ganglia_server.py @@ -21,8 +21,6 @@ limitations under the License. from stacks.utils.RMFTestCase import * from mock.mock import MagicMock, call, patch -@patch("os.path.exists", new = MagicMock(return_value=False)) -@patch("os.path.islink", new = MagicMock(return_value=False)) class TestGangliaServer(RMFTestCase): def test_configure_default(self): @@ -174,9 +172,6 @@ class TestGangliaServer(RMFTestCase): mode = 0755, ) self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', - action = ['delete'], - ) - self.assertResourceCalled('Directory', '/var/lib/ganglia/rrds', owner = 'nobody', group = 'nobody', recursive = True,
