Commit 63ff0a81 authored by lichenchong's avatar lichenchong
Browse files

Kinetic test: 

1. Add html report result for each test runner.
2. Update drive test extends IntegarationTestCase
3. Update chassis test script with ssl test mode.
parent 48b4ff0e

bin/chassisTest.sh

+2 −2
Original line number Diff line number Diff line
@@ -82,14 +82,14 @@ do 
        do

           node_ip=${node_ip_from_as_array[0]}.${node_ip_from_as_array[1]}.${node_ip_from_as_array[2]}.$curr

           echo "start test ${node_ip}..."

           exec "$JAVA" -classpath "$CLASSPATH" -DRUN_NIO_TEST=true -DRUN_AGAINST_EXTERNAL=true -DKINETIC_HOST=${node_ip} com.seagate.kinetic.allTests.DriveSmokeTestsRunner 1>${LOG_DIR}/${node_ip}.log 2>&1 & 

           exec "$JAVA" -classpath "$CLASSPATH" -DRUN_NIO_TEST=true -DRUN_SSL_TEST=true -DRUN_AGAINST_EXTERNAL=true -DKINETIC_HOST=${node_ip} com.seagate.kinetic.allTests.DriveSmokeTestsRunner 1>${LOG_DIR}/${node_ip}.log 2>&1 & 

           total_nodes=$(( total_nodes + 1 )) 

           curr=$(( curr + 1 )) 

        done

    else

        node_ip=${node}

        echo "start test ${node_ip}..."

        exec "$JAVA" -classpath "$CLASSPATH" -DRUN_NIO_TEST=true -DRUN_AGAINST_EXTERNAL=true -DKINETIC_HOST=${node_ip} com.seagate.kinetic.allTests.DriveSmokeTestsRunner 1>${LOG_DIR}/${node_ip}.log 2>&1 & 

        exec "$JAVA" -classpath "$CLASSPATH" -DRUN_NIO_TEST=true -DRUN_SSL_TEST=true -DRUN_AGAINST_EXTERNAL=true -DKINETIC_HOST=${node_ip} com.seagate.kinetic.allTests.DriveSmokeTestsRunner 1>${LOG_DIR}/${node_ip}.log 2>&1 & 

        total_nodes=$(( total_nodes + 1 )) 

    fi

done

kinetic-test/src/test/java/com/seagate/kinetic/allTests/AdminAPISanityTestsRunner.java

+19 −17
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import java.util.ArrayList; 
import java.util.List;



import org.testng.TestNG;

import org.testng.reporters.SuiteHTMLReporter;

import org.testng.xml.XmlClass;

import org.testng.xml.XmlSuite;

import org.testng.xml.XmlTest;
@@ -24,6 +25,7 @@ public class AdminAPISanityTestsRunner { 
        List<XmlSuite> suites = new ArrayList<XmlSuite>();

        suites.add(suite);

        TestNG tng = new TestNG();

        tng.addListener(new SuiteHTMLReporter());

        tng.setXmlSuites(suites);

        tng.run();

kinetic-test/src/test/java/com/seagate/kinetic/allTests/AllTestsRunner.java

+35 −33
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import java.util.ArrayList; 
import java.util.List;



import org.testng.TestNG;

import org.testng.reporters.SuiteHTMLReporter;

import org.testng.xml.XmlClass;

import org.testng.xml.XmlSuite;

import org.testng.xml.XmlTest;
@@ -225,6 +226,7 @@ public class AllTestsRunner { 
        List<XmlSuite> suites = new ArrayList<XmlSuite>();

        suites.add(suite);

        TestNG tng = new TestNG();

        tng.addListener(new SuiteHTMLReporter());

        tng.setXmlSuites(suites);

        tng.run();

kinetic-test/src/test/java/com/seagate/kinetic/allTests/BasicAPISanityTestsRunner.java

+19 −17
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import java.util.ArrayList; 
import java.util.List;



import org.testng.TestNG;

import org.testng.reporters.SuiteHTMLReporter;

import org.testng.xml.XmlClass;

import org.testng.xml.XmlSuite;

import org.testng.xml.XmlTest;
@@ -25,6 +26,7 @@ public class BasicAPISanityTestsRunner { 
        List<XmlSuite> suites = new ArrayList<XmlSuite>();

        suites.add(suite);

        TestNG tng = new TestNG();

        tng.addListener(new SuiteHTMLReporter());

        tng.setXmlSuites(suites);

        tng.run();

kinetic-test/src/test/java/com/seagate/kinetic/allTests/DriveSmokeTestsRunner.java

+21 −19
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import java.util.ArrayList; 
import java.util.List;



import org.testng.TestNG;

import org.testng.reporters.SuiteHTMLReporter;

import org.testng.xml.XmlClass;

import org.testng.xml.XmlSuite;

import org.testng.xml.XmlTest;
@@ -46,6 +47,7 @@ public class DriveSmokeTestsRunner { 
        List<XmlSuite> suites = new ArrayList<XmlSuite>();

        suites.add(suite);

        TestNG tng = new TestNG();

        tng.addListener(new SuiteHTMLReporter());

        tng.setXmlSuites(suites);

        tng.run();