Merge branch 'ballerina-1.2.x' of github.com:ballerina-platform/balle…

…rina-lang into update-netty-version
ballerina-platform · Oct 13, 2023 · 499ae63 · 499ae63
2 parents 92fee61 + dc12994
commit 499ae63
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...tion-test/src/test/java/org/ballerinalang/test/observability/tracing/TracingTestCase.java b/...tion-test/src/test/java/org/ballerinalang/test/observability/tracing/TracingTestCase.java
@@ -186,7 +186,7 @@ public void testObservePackageUserTraceTrue() throws Exception {
         });
     }
 
-    @Test(dependsOnMethods = "testObservePackageUserTraceTrue")
+    @Test(dependsOnMethods = "testObservePackageUserTraceTrue", enabled = false)
     public void testOOTBTracingWithWorkers() throws Exception {
         final String service = "http://localhost:9093/echoService/";
         HttpClientRequest.doGet(service + "resourceOne");
@@ -215,7 +215,7 @@ public void testOOTBTracingWithWorkers() throws Exception {
                 .filter(bMockSpan -> bMockSpan.getParentId() == 0).count(), 8, "Mismatch in number of root spans.");
     }
 
-    @Test(dependsOnMethods = "testOOTBTracingWithWorkers")
+    @Test(dependsOnMethods = "testOOTBTracingWithWorkers", enabled = false)
     public void testOOTBTracingWithErrors() throws Exception {
         final String service = "http://localhost:9094/echoService/";
         HttpClientRequest.doGet(service + "resourceOne/3");

diff --git a/...ration-test/src/test/java/org/ballerinalang/test/packaging/PackagingNegativeTestCase.java b/...ration-test/src/test/java/org/ballerinalang/test/packaging/PackagingNegativeTestCase.java
@@ -121,7 +121,7 @@ public void testBuildWithoutManifest() throws Exception {
         moduleBuildLeecher.waitForText(5000);
     }
 
-    @Test(description = "Test pushing a module to central without any content in Module.md")
+    @Test(description = "Test pushing a module to central without any content in Module.md", enabled = false)
     public void testPushWithoutModuleMDContent() throws Exception {
         Path projectPath = Files.createDirectories(tempProjectDirectory).resolve("projectWithoutModuleMDContent");
         createProjectStructureAndGetProjectPath(projectPath, moduleName);

diff --git a/...na-integration-test/src/test/java/org/ballerinalang/test/packaging/PackagingTestCase.java b/...na-integration-test/src/test/java/org/ballerinalang/test/packaging/PackagingTestCase.java
@@ -104,7 +104,7 @@ public void testCreateProject() throws Exception {
         Assert.assertTrue(Files.isDirectory(projectPath.resolve("src").resolve(moduleName)));
     }
 
-    @Test(description = "Test pushing a package to central", dependsOnMethods = "testCreateProject")
+    @Test(description = "Test pushing a package to central", dependsOnMethods = "testCreateProject", enabled = false)
     public void testPush() throws Exception {
         Path projectPath = tempProjectDirectory.resolve("initProject");
 
@@ -142,7 +142,7 @@ public void testPush() throws Exception {
         clientLeecher.waitForText(60000);
     }
 
-    @Test(description = "Test pulling a package from central", dependsOnMethods = "testPush")
+    @Test(description = "Test pulling a package from central", dependsOnMethods = "testPush", enabled = false)
     public void testPull() {
         String baloFileName = moduleName + "-"
                               + ProgramFileConstants.IMPLEMENTATION_VERSION + "-"
@@ -165,7 +165,7 @@ public void testPull() {
         Assert.assertTrue(Files.exists(tempHomeDirectory.resolve(baloPath).resolve(baloFileName)));
     }
 
-    @Test(description = "Test searching a package from central", dependsOnMethods = "testPush")
+    @Test(description = "Test searching a package from central", dependsOnMethods = "testPush", enabled = false)
     public void testSearch() throws BallerinaTestException {
         String actualMsg = balClient.runMainAndReadStdOut("search", new String[]{moduleName}, envVariables,
                 balServer.getServerHome(), false);

diff --git a/...tegration-test/src/test/java/org/ballerinalang/test/packaging/PathDependencyTestCase.java b/...tegration-test/src/test/java/org/ballerinalang/test/packaging/PathDependencyTestCase.java
@@ -200,7 +200,7 @@ public void testBaloPathCase3() throws BallerinaTestException {
      *
      * @throws BallerinaTestException Error when executing the commands.
      */
-    @Test()
+    @Test(enabled = false)
     public void testBaloPathCase4() throws BallerinaTestException, IOException, InterruptedException {
         Path caseResources = tempTestResources.resolve("case4");
         // Build bee module of TestProject1
@@ -455,7 +455,7 @@ public void testBaloPathCase7() throws BallerinaTestException {
      * @throws BallerinaTestException Error when executing the commands.
      */
     @Test(description = "Case8: Test single bal file using external module with interop dependency",
-    dependsOnMethods = "testBaloPathCase4")
+    dependsOnMethods = "testBaloPathCase4", enabled = false)
     public void testBaloSingleBalFileCase8() throws BallerinaTestException, IOException {
 
         Path caseResources = tempTestResources.resolve("case8");

diff --git a/tests/jballerina-integration-test/src/test/resources/testng.xml b/tests/jballerina-integration-test/src/test/resources/testng.xml
@@ -315,7 +315,7 @@
             <class name="org.ballerinalang.test.packaging.ModulePushTestCase"/>
             <class name="org.ballerinalang.test.packaging.PackagingNegativeTestCase"/>
             <class name="org.ballerinalang.test.packaging.PackagingTestCase"/>
-            <class name="org.ballerinalang.test.packaging.LockFileTestCase"/>
+<!--            <class name="org.ballerinalang.test.packaging.LockFileTestCase"/>-->
             <!--            <class name="org.ballerinalang.test.packaging.NativePackagingTestCase"/>-->
             <class name="org.ballerinalang.test.packaging.PathDependencyTestCase"/>
             <class name="org.ballerinalang.test.packaging.DirectoryTestCase"/>