atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svimal2...@apache.org
Subject incubator-atlas git commit: Revert "Fix failure of Hive ITs(ayubkhan, svimal2106 via svimal2106)"
Date Thu, 24 Nov 2016 13:41:02 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master db359532a -> 86740c148


Revert "Fix failure of Hive ITs(ayubkhan, svimal2106 via svimal2106)"

This reverts commit db359532ac32130ce1af044784b6d746fdafc70a.


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/86740c14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/86740c14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/86740c14

Branch: refs/heads/master
Commit: 86740c148b16940930bdbfe88998b31046d781f6
Parents: db35953
Author: Vimal Sharma <svimal2106@apache.org>
Authored: Thu Nov 24 19:10:37 2016 +0530
Committer: Vimal Sharma <svimal2106@apache.org>
Committed: Thu Nov 24 19:10:37 2016 +0530

----------------------------------------------------------------------
 addons/hive-bridge/pom.xml                      | 42 --------------------
 .../org/apache/atlas/hive/hook/HiveHookIT.java  |  5 +--
 pom.xml                                         |  6 +++
 release-log.txt                                 |  1 -
 4 files changed, 8 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/86740c14/addons/hive-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/pom.xml b/addons/hive-bridge/pom.xml
index 6a4dac9..b8f1d07 100755
--- a/addons/hive-bridge/pom.xml
+++ b/addons/hive-bridge/pom.xml
@@ -400,48 +400,6 @@
                 <executions>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/models</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}/../models</directory>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.19.1</version>
-            <configuration>
-            <systemPropertyVariables>
-                <atlas.home>${basedir}/target</atlas.home>
-            </systemPropertyVariables>
-            </configuration>
-                <executions>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>install</phase>
-                        <goals>
-                            <goal>integration-test</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/86740c14/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
----------------------------------------------------------------------
diff --git a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
index 42430e7..40866fe 100755
--- a/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
+++ b/addons/hive-bridge/src/test/java/org/apache/atlas/hive/hook/HiveHookIT.java
@@ -200,7 +200,7 @@ public class HiveHookIT extends HiveITBase {
         String colName = columnName();
 
         String pFile = createTestDFSPath("parentPath");
-        final String query = String.format("create EXTERNAL table %s.%s( %s, %s) location
'%s'", DEFAULT_DB , tableName , colName + " int", "name string",  pFile);
+        final String query = String.format("create TEMPORARY EXTERNAL table %s.%s( %s, %s)
location '%s'", DEFAULT_DB , tableName , colName + " int", "name string",  pFile);
         runCommand(query);
         assertTableIsRegistered(DEFAULT_DB, tableName, null, true);
         String processId = assertEntityIsRegistered(HiveDataTypes.HIVE_PROCESS.getName(),
@@ -658,8 +658,7 @@ public class HiveHookIT extends HiveITBase {
         Assert.assertEquals(process2Reference.getId()._getId(), processReference.getId()._getId());
     }
 
-    //Disabling test as temporary table is not captured by hiveHook(https://issues.apache.org/jira/browse/ATLAS-1274)
-    @Test(enabled = false)
+    @Test
     public void testInsertIntoTempTable() throws Exception {
         String tableName = createTable();
         String insertTableName = createTable(false, false, true);

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/86740c14/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 87ec46a..2b65a38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1749,6 +1749,12 @@
                     <forkCount>1</forkCount>
                     <threadCount>5</threadCount>
                     <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <!-- ATLAS-1317: Disable problematic tests. Need to revisit and fix
them later -->
+                    <excludes>
+                        <exclude>**/TypesJerseyResourceIT.java</exclude>
+                        <exclude>**/MetadataDiscoveryJerseyResourceIT.java</exclude>
+                        <exclude>**/HiveHookIT.java</exclude>
+                    </excludes>
                 </configuration>
                 <executions>
                     <execution>

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/86740c14/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 38fe3b6..65511a8 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,7 +9,6 @@ ATLAS-1060 Add composite indexes for exact match performance improvements
for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 ALL CHANGES:
-ATLAS-1321 Fix failure of Hive ITs (ayubkhan, svimal2106 via svimal2106)
 ATLAS-1324 Fix SecureEmbeddedServerTest.testServerConfiguredUsingCredentialProvider UT failure(ayubkhan
via svimal2106)
 ATLAS-1316 V2 API webapp tests are failing (ayubkhan via svimal2106)
 ATLAS-1315 Fix webapp Integration tests (ayubkhan,apoorvnaik via svimal2106)


Mime
View raw message