Repository: ambari Updated Branches: refs/heads/trunk 27539cd09 -> b424b21f0
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/b424b21f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b424b21f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b424b21f Branch: refs/heads/trunk Commit: b424b21f01ac0837e717f901f292a0627612d24a Parents: 27539cd Author: Myroslav Papirkovskyy <mpapyrkovs...@hortonworks.com> Authored: Thu May 15 21:32:20 2014 +0300 Committer: Myroslav Papirkovskyy <mpapyrkovs...@hortonworks.com> Committed: Thu May 15 21:34:44 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/b424b21f/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,
