Repository: incubator-atlas Updated Branches: refs/heads/master 65d95ebe2 -> 42d5e37e3
ATLAS-841 mvn clean install of Atlas is failing python unit tests (yhemanth) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/42d5e37e Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/42d5e37e Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/42d5e37e Branch: refs/heads/master Commit: 42d5e37e3b1c03738787746587dd357330c72296 Parents: 65d95eb Author: Hemanth Yamijala <[email protected]> Authored: Tue May 31 22:10:37 2016 +0530 Committer: Hemanth Yamijala <[email protected]> Committed: Tue May 31 22:10:37 2016 +0530 ---------------------------------------------------------------------- distro/src/test/python/scripts/TestMetadata.py | 74 ++++++++++++++++++++- release-log.txt | 1 + 2 files changed, 74 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/42d5e37e/distro/src/test/python/scripts/TestMetadata.py ---------------------------------------------------------------------- diff --git a/distro/src/test/python/scripts/TestMetadata.py b/distro/src/test/python/scripts/TestMetadata.py index 00ca3e2..90c5b97 100644 --- a/distro/src/test/python/scripts/TestMetadata.py +++ b/distro/src/test/python/scripts/TestMetadata.py @@ -42,12 +42,18 @@ class TestMetadata(unittest.TestCase): @patch.object(mc, "expandWebApp") @patch("os.path.exists") @patch.object(mc, "java") + @patch.object(mc, "is_hbase_local") + @patch.object(mc, "is_solr_local") - def test_main(self, java_mock, exists_mock, expandWebApp_mock, atlasDir_mock, executeEnvSh_mock, writePid_mock, exist_pid_mock, grep_mock, getConfig_mock, configure_hbase_mock, runProcess_mock): + def test_main_embedded(self, is_solr_local_mock, is_hbase_local_mock, java_mock, exists_mock, expandWebApp_mock, + atlasDir_mock, executeEnvSh_mock, writePid_mock, exist_pid_mock, grep_mock, getConfig_mock, + configure_hbase_mock, runProcess_mock): sys.argv = [] exists_mock.return_value = True expandWebApp_mock.return_value = "webapp" atlasDir_mock.return_value = "atlas_home" + is_hbase_local_mock.return_value = True + is_solr_local_mock.return_value = True exist_pid_mock(789) exist_pid_mock.assert_called_with(789) @@ -92,6 +98,72 @@ class TestMetadata(unittest.TestCase): pass + @patch.object(mc,"runProcess") + @patch.object(mc,"configure_hbase") + @patch.object(mc,"getConfig") + @patch.object(mc,"grep") + @patch.object(mc,"exist_pid") + @patch.object(mc,"writePid") + @patch.object(mc, "executeEnvSh") + @patch.object(mc,"atlasDir") + @patch.object(mc, "expandWebApp") + @patch("os.path.exists") + @patch.object(mc, "java") + @patch.object(mc, "is_hbase_local") + @patch.object(mc, "is_solr_local") + def test_main_default(self, is_solr_local_mock, is_hbase_local_mock, java_mock, exists_mock, expandWebApp_mock, + atlasDir_mock, executeEnvSh_mock, writePid_mock, exist_pid_mock, grep_mock, getConfig_mock, + configure_hbase_mock, runProcess_mock): + sys.argv = [] + exists_mock.return_value = True + expandWebApp_mock.return_value = "webapp" + atlasDir_mock.return_value = "atlas_home" + is_hbase_local_mock.return_value = False + is_solr_local_mock.return_value = False + + exist_pid_mock(789) + exist_pid_mock.assert_called_with(789) + grep_mock.return_value = "hbase" + getConfig_mock.return_value = "localhost:9838" + + atlas.main() + self.assertFalse(configure_hbase_mock.called) + + if IS_WINDOWS: + calls = [call(['atlas_home\\hbase\\bin\\start-hbase.cmd', '--config', 'atlas_home\\hbase\\conf', 'start', 'master'], 'atlas_home\\logs', False, True), + call(['atlas_home\\solr\\bin\\solr.cmd', 'start', '-z', 'localhost:9838', '-p', '9838'], 'atlas_home\\logs', False, True), + call(['atlas_home\\solr\\bin\\solr.cmd', 'create', '-c', 'vertex_index', '-d', 'atlas_home\\solr\\server\\solr\\configsets\\basic_configs\\conf', '-shards', '1', '-replicationFactor', '1'], 'atlas_home\\logs', False, True), + call(['atlas_home\\solr\\bin\\solr.cmd', 'create', '-c', 'edge_index', '-d', 'atlas_home\\solr\\server\\solr\\configsets\\basic_configs\\conf', '-shards', '1', '-replicationFactor', '1'], 'atlas_home\\logs', False, True), + call(['atlas_home\\solr\\bin\\solr.cmd', 'create', '-c', 'fulltext_index', '-d', 'atlas_home\\solr\\server\\solr\\configsets\\basic_configs\\conf', '-shards', '1', '-replicationFactor', '1'], 'atlas_home\\logs', False, True)] + + runProcess_mock.assert_not_called(calls) + else: + calls = [call(['atlas_home/hbase/bin/hbase-daemon.sh', '--config', 'atlas_home/hbase/conf', 'start', 'master'], 'atlas_home/logs', False, True), + call(['atlas_home/solr/bin/solr', 'start', '-z', 'localhost:9838', '-p', '9838'], 'atlas_home/logs', False, True), + call(['atlas_home/solr/bin/solr', 'create', '-c', 'vertex_index', '-d', 'atlas_home/solr/server/solr/configsets/basic_configs/conf', '-shards', '1', '-replicationFactor', '1'], 'atlas_home/logs', False, True), + call(['atlas_home/solr/bin/solr', 'create', '-c', 'edge_index', '-d', 'atlas_home/solr/server/solr/configsets/basic_configs/conf', '-shards', '1', '-replicationFactor', '1'], 'atlas_home/logs', False, True), + call(['atlas_home/solr/bin/solr', 'create', '-c', 'fulltext_index', '-d', 'atlas_home/solr/server/solr/configsets/basic_configs/conf', '-shards', '1', '-replicationFactor', '1'], 'atlas_home/logs', False, True)] + + runProcess_mock.assert_not_called(calls) + + self.assertTrue(java_mock.called) + if IS_WINDOWS: + + java_mock.assert_called_with( + 'org.apache.atlas.Atlas', + ['-app', 'atlas_home\\server\\webapp\\atlas'], + 'atlas_home\\conf;atlas_home\\server\\webapp\\atlas\\WEB-INF\\classes;atlas_home\\server\\webapp\\atlas\\WEB-INF\\lib\\atlas-titan-${project.version}.jar;atlas_home\\server\\webapp\\atlas\\WEB-INF\\lib\\*;atlas_home\\libext\\*;atlas_home\\hbase\\conf', + ['-Datlas.log.dir=atlas_home\\logs', '-Datlas.log.file=application.log', '-Datlas.home=atlas_home', '-Datlas.conf=atlas_home\\conf', '-Xmx1024m', '-XX:MaxPermSize=512m', '-Dlog4j.configuration=atlas-log4j.xml', '-Djava.net.preferIPv4Stack=true'], 'atlas_home\\logs') + + else: + java_mock.assert_called_with( + 'org.apache.atlas.Atlas', + ['-app', 'atlas_home/server/webapp/atlas'], + 'atlas_home/conf:atlas_home/server/webapp/atlas/WEB-INF/classes:atlas_home/server/webapp/atlas/WEB-INF/lib/atlas-titan-${project.version}.jar:atlas_home/server/webapp/atlas/WEB-INF/lib/*:atlas_home/libext/*:atlas_home/hbase/conf', + ['-Datlas.log.dir=atlas_home/logs', '-Datlas.log.file=application.log', '-Datlas.home=atlas_home', '-Datlas.conf=atlas_home/conf', '-Xmx1024m', '-XX:MaxPermSize=512m', '-Dlog4j.configuration=atlas-log4j.xml', '-Djava.net.preferIPv4Stack=true'], 'atlas_home/logs') + + pass + def test_jar_java_lookups_fail(self): java_home = environ['JAVA_HOME'] del environ['JAVA_HOME'] http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/42d5e37e/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index da80b6e..4dbe0d4 100644 --- a/release-log.txt +++ b/release-log.txt @@ -22,6 +22,7 @@ ATLAS-409 Atlas will not import avro tables with schema read from a file (dosset ATLAS-379 Create sqoop and falcon metadata addons (venkatnrangan,bvellanki,sowmyaramesh via shwethags) ALL CHANGES: +ATLAS-841 mvn clean install of Atlas is failing python unit tests (yhemanth) ATLAS-834 Handle exceptions from HiveHook executor.submit() (sumasai) ATLAS-635 Process showing old entity name where as actual entity is renamed ( svimal2106 via sumasai ) ATLAS-823 Atlas should use external HBase and SOLR (tbeerbower via shwethags)
