Browse Source

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

Myroslav Papirkovskyy 11 years ago
parent
commit
0982aa2e30

+ 1 - 3
ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog160Test.java

@@ -148,9 +148,7 @@ public class UpgradeCatalog160Test {
       capture(restartRequiredColumnCapture));
       capture(restartRequiredColumnCapture));
 
 
     dbAccessor.addFKConstraint("hostgroup_configuration", "FK_hg_config_blueprint_name",
     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,
   private void setViewEntityConfigExpectations(DBAccessor dbAccessor,