You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ma...@apache.org on 2012/09/06 09:42:20 UTC
svn commit: r1381493 [2/2] - in /incubator/ambari/branches/AMBARI-666: ./
ambari-agent/ ambari-agent/src/main/python/
ambari-agent/src/main/python/ambari_agent/ ambari-agent/src/test/
ambari-agent/src/test/python/ ambari-project/ ambari-server/
Added: incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestFileUtil.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestFileUtil.py?rev=1381493&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestFileUtil.py (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestFileUtil.py Thu Sep 6 07:42:18 2012
@@ -0,0 +1,56 @@
+#!/usr/bin/env python2.6
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+from unittest import TestCase
+from ambari_agent.FileUtil import writeFile, createStructure, deleteStructure
+import os, errno
+
+class TestFileUtil(TestCase):
+ def test_createStructure(self):
+ action = { 'clusterId' : 'abc', 'role' : 'hdfs', 'workDirComponent' : 'abc-hdfs' }
+ result = {}
+ result = createStructure(action, result)
+ self.assertEqual(result['exitCode'], 0, 'Create cluster structure failed.')
+
+# def test_writeFile(self):
+ configFile = {
+ "data" : "test",
+ "owner" : os.getuid(),
+ "group" : os.getgid() ,
+ "permission" : 0700,
+ "path" : "/tmp/ambari_file_test/_file_write_test",
+ "umask" : 022
+ }
+ action = {
+ 'clusterId' : 'abc',
+ 'role' : 'hdfs',
+ 'workDirComponent' : 'abc-hdfs',
+ 'file' : configFile
+ }
+ result = { }
+ result = writeFile(action, result)
+ self.assertEqual(result['exitCode'], 0, 'WriteFile test with uid/gid failed.')
+
+# def test_deleteStructure(self):
+ result = { }
+ action = { 'clusterId' : 'abc', 'role' : 'hdfs', 'workDirComponent' : 'abc-hdfs' }
+ result = deleteStructure(action, result)
+ self.assertEqual(result['exitCode'], 0, 'Delete cluster structure failed.')
+
Added: incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestHardware.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestHardware.py?rev=1381493&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestHardware.py (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestHardware.py Thu Sep 6 07:42:18 2012
@@ -0,0 +1,30 @@
+#!/usr/bin/env python2.6
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+from unittest import TestCase
+from ambari_agent.Hardware import Hardware
+
+class TestHardware(TestCase):
+ def test_build(self):
+ hardware = Hardware()
+ result = hardware.get()
+ self.assertTrue(result['coreCount'] >= 1)
+ self.assertTrue(result['netSpeed'] != None)
+
Added: incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestHeartbeat.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestHeartbeat.py?rev=1381493&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestHeartbeat.py (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestHeartbeat.py Thu Sep 6 07:42:18 2012
@@ -0,0 +1,32 @@
+#!/usr/bin/env python2.6
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+from unittest import TestCase
+from ambari_agent.Heartbeat import Heartbeat
+from ambari_agent.ActionQueue import ActionQueue
+from ambari_agent.AmbariConfig import AmbariConfig
+import socket
+
+class TestHeartbeat(TestCase):
+ def test_build(self):
+ actionQueue = ActionQueue(AmbariConfig().getConfig())
+ heartbeat = Heartbeat(actionQueue)
+ result = heartbeat.build(100)
+
\ No newline at end of file
Added: incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestServerStatus.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestServerStatus.py?rev=1381493&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestServerStatus.py (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/TestServerStatus.py Thu Sep 6 07:42:18 2012
@@ -0,0 +1,29 @@
+#!/usr/bin/env python2.6
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+from unittest import TestCase
+from ambari_agent.ServerStatus import ServerStatus
+
+class TestServerStatus(TestCase):
+ def test_build(self):
+ serverStatus = ServerStatus()
+ result = serverStatus.build()
+ self.assertEqual(result, [], 'List of running servers should be 0.')
+
Added: incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/unitTests.py
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/unitTests.py?rev=1381493&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/unitTests.py (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-agent/src/test/python/unitTests.py Thu Sep 6 07:42:18 2012
@@ -0,0 +1,51 @@
+#!/usr/bin/env python2.6
+
+'''
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+'''
+
+import unittest
+import doctest
+
+class TestAgent(unittest.TestSuite):
+ def run(self, result):
+ run = unittest.TestSuite.run
+ run(self, result)
+ return result
+
+def all_tests_suite():
+ suite = unittest.TestLoader().loadTestsFromNames([
+ 'TestHeartbeat',
+ 'TestHardware',
+ 'TestServerStatus',
+ 'TestFileUtil',
+ 'TestActionQueue',
+ 'TestAmbariComponent',
+ 'TestAgentActions'
+ ])
+ return TestAgent([suite])
+
+def main():
+ runner = unittest.TextTestRunner()
+ suite = all_tests_suite()
+ raise SystemExit(not runner.run(suite).wasSuccessful())
+
+if __name__ == '__main__':
+ import os
+ import sys
+ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+ main()
Modified: incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml?rev=1381493&r1=1381492&r2=1381493&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-project/pom.xml Thu Sep 6 07:42:18 2012
@@ -17,11 +17,11 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<description>Apache Ambari Project POM</description>
<name>Apache Ambari Project POM</name>
<packaging>pom</packaging>
Modified: incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml?rev=1381493&r1=1381492&r2=1381493&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-server/pom.xml Thu Sep 6 07:42:18 2012
@@ -13,7 +13,7 @@
<parent>
<groupId>org.apache.ambari</groupId>
<artifactId>ambari-project</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<relativePath>../ambari-project</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
<artifactId>ambari-server</artifactId>
<packaging>jar</packaging>
<name>ambari-server</name>
- <version>0.10.0-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<description>Ambari Server</description>
<build>
<plugins>
Modified: incubator/ambari/branches/AMBARI-666/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/pom.xml?rev=1381493&r1=1381492&r2=1381493&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/pom.xml (original)
+++ incubator/ambari/branches/AMBARI-666/pom.xml Thu Sep 6 07:42:18 2012
@@ -21,7 +21,7 @@
<artifactId>ambari</artifactId>
<packaging>pom</packaging>
<name>ambari</name>
- <version>0.10.0-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
<description>Ambari</description>
<pluginRepositories>
<pluginRepository>
@@ -50,6 +50,15 @@
<descriptor>ambari-project/src/main/assemblies/empty.xml</descriptor>
</descriptors>
</configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>