You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2014/05/15 20:29:36 UTC

git commit: AMBARI-5751. Ambari upgrade to Ambari-1.6.0 from Ambari-1.5.1 logs PSQLException. Unit test fix. (mpapirkovskyy)

Repository: ambari
Updated Branches:
  refs/heads/branch-1.6.0 cec51f34c -> 70b146bfa


AMBARI-5751. Ambari upgrade to Ambari-1.6.0 from Ambari-1.5.1 logs PSQLException. Unit test fix. (mpapirkovskyy)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70b146bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70b146bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70b146bf

Branch: refs/heads/branch-1.6.0
Commit: 70b146bfabcb5def669f2820be7698fbaa79e69e
Parents: cec51f3
Author: Myroslav Papirkovskyy <mp...@hortonworks.com>
Authored: Thu May 15 21:29:00 2014 +0300
Committer: Myroslav Papirkovskyy <mp...@hortonworks.com>
Committed: Thu May 15 21:29:20 2014 +0300

----------------------------------------------------------------------
 .../org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/70b146bf/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java
index c02b109..e0c97d2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java
@@ -148,9 +148,7 @@ public class UpgradeCatalog160Test {
       capture(restartRequiredColumnCapture));
 
     dbAccessor.addFKConstraint("hostgroup_configuration", "FK_hg_config_blueprint_name",
-        "blueprint_name", "hostgroup", "blueprint_name", true);
-    dbAccessor.addFKConstraint("hostgroup_configuration", "FK_hg_config_hostgroup_name",
-        "hostgroup_name", "hostgroup", "name", true);
+        new String[]{"blueprint_name", "hostgroup_name"}, "hostgroup", new String[]{"blueprint_name", "name"}, true);
   }
 
   private void setViewEntityConfigExpectations(DBAccessor dbAccessor,