Disabling the calls made to cleanup.sql from Junit upgrade tests

Sakshams · Sakshams · commit c16d7e547855 · 2012-07-18T11:52:11.000+05:30
diff --git a/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java b/server/test/com/cloud/upgrade/AdvanceZone217To224UpgradeTest.java
@@ -35,7 +35,7 @@ public class AdvanceZone217To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java b/server/test/com/cloud/upgrade/BasicZone218To224UpgradeTest.java
@@ -35,7 +35,7 @@ public class BasicZone218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/HostCapacity218to22Test.java b/server/test/com/cloud/upgrade/HostCapacity218to22Test.java
@@ -30,7 +30,7 @@ public class HostCapacity218to22Test extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java b/server/test/com/cloud/upgrade/InstanceGroup218To224UpgradeTest.java
@@ -36,7 +36,7 @@ public class InstanceGroup218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java b/server/test/com/cloud/upgrade/PortForwarding218To224UpgradeTest.java
@@ -35,7 +35,7 @@ public class PortForwarding218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity220To224UpgradeTest.java
@@ -34,7 +34,7 @@ public class Sanity220To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
 
     @Override
diff --git a/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity222To224UpgradeTest.java
@@ -34,7 +34,7 @@ public class Sanity222To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
 
     @Override
diff --git a/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java b/server/test/com/cloud/upgrade/Sanity224To225UpgradeTest.java
@@ -34,7 +34,7 @@ public class Sanity224To225UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
 
     @Override
diff --git a/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java b/server/test/com/cloud/upgrade/Template2214To30UpgradeTest.java
@@ -37,8 +37,7 @@ public class Template2214To30UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false,
-                true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
 
     @Override
diff --git a/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java
@@ -37,8 +37,7 @@ public class Test2214To30DBUpgrade extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false,
-                true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
 
     @Override
diff --git a/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java b/server/test/com/cloud/upgrade/Usage217To224UpgradeTest.java
@@ -35,8 +35,8 @@ public class Usage217To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
-        DbTestUtils.executeUsageScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeUsageScript("cleanup.sql", false, true);
     }
     
     @Override
diff --git a/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java b/server/test/com/cloud/upgrade/UsageEvents218To224UpgradeTest.java
@@ -35,7 +35,7 @@ public class UsageEvents218To224UpgradeTest extends TestCase {
     @Override
     @Before
     public void setUp() throws Exception {
-        DbTestUtils.executeScript("cleanup.sql", false, true);
+    // DbTestUtils.executeScript("cleanup.sql", false, true);
     }
     
     @Override

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class AdvanceZone217To224UpgradeTest extends TestCase {`
`35`	`35`	`@Override`
`36`	`36`	`@Before`
`37`	`37`	`public void setUp() throws Exception {`
`38`		`- DbTestUtils.executeScript("cleanup.sql", false, true);`
	`38`	`+ // DbTestUtils.executeScript("cleanup.sql", false, true);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class BasicZone218To224UpgradeTest extends TestCase {`
`35`	`35`	`@Override`
`36`	`36`	`@Before`
`37`	`37`	`public void setUp() throws Exception {`
`38`		`- DbTestUtils.executeScript("cleanup.sql", false, true);`
	`38`	`+ // DbTestUtils.executeScript("cleanup.sql", false, true);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class HostCapacity218to22Test extends TestCase {`
`30`	`30`	`@Override`
`31`	`31`	`@Before`
`32`	`32`	`public void setUp() throws Exception {`
`33`		`- DbTestUtils.executeScript("cleanup.sql", false, true);`
	`33`	`+ // DbTestUtils.executeScript("cleanup.sql", false, true);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public class InstanceGroup218To224UpgradeTest extends TestCase {`
`36`	`36`	`@Override`
`37`	`37`	`@Before`
`38`	`38`	`public void setUp() throws Exception {`
`39`		`- DbTestUtils.executeScript("cleanup.sql", false, true);`
	`39`	`+ // DbTestUtils.executeScript("cleanup.sql", false, true);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class PortForwarding218To224UpgradeTest extends TestCase {`
`35`	`35`	`@Override`
`36`	`36`	`@Before`
`37`	`37`	`public void setUp() throws Exception {`
`38`		`- DbTestUtils.executeScript("cleanup.sql", false, true);`
	`38`	`+ // DbTestUtils.executeScript("cleanup.sql", false, true);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class Sanity220To224UpgradeTest extends TestCase {`
`34`	`34`	`@Override`
`35`	`35`	`@Before`
`36`	`36`	`public void setUp() throws Exception {`
`37`		`- DbTestUtils.executeScript("cleanup.sql", false, true);`
	`37`	`+ // DbTestUtils.executeScript("cleanup.sql", false, true);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ public class Template2214To30UpgradeTest extends TestCase {`
`37`	`37`	`@Override`
`38`	`38`	`@Before`
`39`	`39`	`public void setUp() throws Exception {`
`40`		`- DbTestUtils.executeScript("cleanup.sql", false,`
`41`		`- true);`
	`40`	`+ // DbTestUtils.executeScript("cleanup.sql", false, true);`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ public class Test2214To30DBUpgrade extends TestCase {`
`37`	`37`	`@Override`
`38`	`38`	`@Before`
`39`	`39`	`public void setUp() throws Exception {`
`40`		`- DbTestUtils.executeScript("cleanup.sql", false,`
`41`		`- true);`
	`40`	`+ // DbTestUtils.executeScript("cleanup.sql", false, true);`
`42`	`41`	`}`
`43`	`42`
`44`	`43`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public class UsageEvents218To224UpgradeTest extends TestCase {`
`35`	`35`	`@Override`
`36`	`36`	`@Before`
`37`	`37`	`public void setUp() throws Exception {`
`38`		`- DbTestUtils.executeScript("cleanup.sql", false, true);`
	`38`	`+ // DbTestUtils.executeScript("cleanup.sql", false, true);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`