Skip to content
Snippets Groups Projects
Commit d2a2456b authored by James Dubee's avatar James Dubee Committed by Rodric Rabbah
Browse files

Flip More CLI Test Suite Switches to Use Go CLI

- Use the Go CLI in the following test suites:
	CLISwiftTests, ConsoleTests, PackageTests, Swift3WhiskObjectTests,
	WskActionSequenceTests

- Flips the remaining switches to use the Go CLI with test suites
parent fe0972a7
No related branches found
No related tags found
No related merge requests found
Showing
with 21 additions and 26 deletions
......@@ -77,7 +77,7 @@ case class WskProps(
def overrides = Seq("-i", "--apihost", apihost, "--apiversion", apiversion)
}
class Wsk(override val usePythonCLI: Boolean = true) extends RunWskCmd {
class Wsk(override val usePythonCLI: Boolean = false) extends RunWskCmd {
implicit val action = new WskAction(usePythonCLI)
implicit val trigger = new WskTrigger(usePythonCLI)
implicit val rule = new WskRule(usePythonCLI)
......@@ -202,7 +202,7 @@ trait HasActivation {
}
}
class WskAction(override val usePythonCLI: Boolean = true)
class WskAction(override val usePythonCLI: Boolean = false)
extends RunWskCmd
with ListOrGetFromCollection
with DeleteFromCollection
......@@ -268,7 +268,7 @@ class WskAction(override val usePythonCLI: Boolean = true)
}
}
class WskTrigger(override val usePythonCLI: Boolean = true)
class WskTrigger(override val usePythonCLI: Boolean = false)
extends RunWskCmd
with ListOrGetFromCollection
with DeleteFromCollection
......@@ -319,7 +319,7 @@ class WskTrigger(override val usePythonCLI: Boolean = true)
}
}
class WskRule(override val usePythonCLI: Boolean = true)
class WskRule(override val usePythonCLI: Boolean = false)
extends RunWskCmd
with ListOrGetFromCollection
with DeleteFromCollection
......@@ -435,7 +435,7 @@ class WskRule(override val usePythonCLI: Boolean = true)
}
}
class WskActivation(override val usePythonCLI: Boolean = true)
class WskActivation(override val usePythonCLI: Boolean = false)
extends RunWskCmd
with HasActivation
with WaitFor {
......@@ -612,7 +612,7 @@ class WskActivation(override val usePythonCLI: Boolean = true)
private case class PartialResult(ids: Seq[String]) extends Throwable
}
class WskNamespace(override val usePythonCLI: Boolean = true)
class WskNamespace(override val usePythonCLI: Boolean = false)
extends RunWskCmd
with FullyQualifiedNames {
......@@ -646,7 +646,7 @@ class WskNamespace(override val usePythonCLI: Boolean = true)
}
}
class WskPackage(override val usePythonCLI: Boolean = true)
class WskPackage(override val usePythonCLI: Boolean = false)
extends RunWskCmd
with ListOrGetFromCollection
with DeleteFromCollection {
......@@ -762,7 +762,7 @@ object Wsk {
sealed trait RunWskCmd {
val usePythonCLI: Boolean = true
val usePythonCLI: Boolean = false
/**
* The base command to run.
......
......@@ -49,7 +49,7 @@ public class WskCli {
private Map<String, String> env = null;
private Boolean usePythonCLI = true;
private Boolean usePythonCLI = false;
public static enum Item {
Package("package"), Trigger("trigger"), Action("action"), Rule("rule"), Activation("activation");
......
......@@ -34,7 +34,7 @@ import common.WskCli;
*/
@RunWith(ParallelRunner.class)
public class SamplesTests {
private static final Boolean usePythonCLI = true;
private static final Boolean usePythonCLI = false;
private final WskCli wsk = new WskCli(usePythonCLI);
@BeforeClass
......
......@@ -32,7 +32,7 @@ import common.WskCli;
*/
@RunWith(ParallelRunner.class)
public class SlackTests {
private static final Boolean usePythonCLI = true;
private static final Boolean usePythonCLI = false;
private static final WskCli wsk = new WskCli(usePythonCLI);
private static final int DEFAULT_WAIT = 100;
......
......@@ -27,7 +27,7 @@ import spray.json.DefaultJsonProtocol.StringJsonFormat
class UtilsTests extends TestHelpers with WskTestHelpers with Matchers {
implicit val wskprops = WskProps()
var usePythonCLI = true
var usePythonCLI = false
val wsk = new Wsk(usePythonCLI)
val lines = JsArray(JsString("seven"), JsString("eight"), JsString("nine"))
......
......@@ -42,7 +42,7 @@ class WebSocketTests
with JsHelpers {
implicit val wskprops = WskProps()
var usePythonCLI = true
var usePythonCLI = false
val wsk = new Wsk(usePythonCLI)
......
......@@ -44,7 +44,7 @@ import common.WskCli;
*/
@RunWith(ParallelRunner.class)
public class CLIActionTests {
private static final Boolean usePythonCLI = true;
private static final Boolean usePythonCLI = false;
private static final WskCli wsk = new WskCli(usePythonCLI);
public static final String[] sampleTestWords = new String[] { "SHERLOCK", "WATSON", "LESTRADE" };
......
......@@ -39,8 +39,7 @@ class CLISwiftTests
with Matchers {
implicit val wskprops = WskProps()
var usePythonCLI = true
val wsk = new Wsk(usePythonCLI)
val wsk = new Wsk(usePythonCLI = false)
val expectedDuration = 30 seconds
val activationPollDuration = 60 seconds
......
......@@ -45,8 +45,7 @@ class ConsoleTests
with WskTestHelpers {
implicit val wskprops = WskProps()
var usePythonCLI = true
val wsk = new Wsk(usePythonCLI)
val wsk = new Wsk(usePythonCLI = false)
behavior of "Wsk Activation Console"
......
......@@ -54,8 +54,7 @@ class PackageTests
with WskTestHelpers {
implicit val wskprops = WskProps()
var usePythonCLI = true
val wsk = new Wsk(usePythonCLI)
val wsk = new Wsk(usePythonCLI = false)
val LOG_DELAY = 80 seconds
behavior of "Wsk Package"
......
......@@ -39,8 +39,7 @@ class Swift3WhiskObjectTests
with JsHelpers {
implicit val wskprops = WskProps()
var usePythonCLI = true
val wsk = new Wsk(usePythonCLI)
val wsk = new Wsk(usePythonCLI = false)
behavior of "Swift 3 Whisk backend API"
......
......@@ -45,8 +45,7 @@ class WskActionSequenceTests
with WskTestHelpers {
implicit val wskprops = WskProps()
var usePythonCLI = true
val wsk = new Wsk(usePythonCLI)
val wsk = new Wsk(usePythonCLI = false)
val defaultAction = Some(TestUtils.getCatalogFilename("samples/hello.js"))
val allowedActionDuration = 120 seconds
......
......@@ -52,7 +52,7 @@ class WskBasicTests
with WskTestHelpers {
implicit val wskprops = WskProps()
var usePythonCLI = true
var usePythonCLI = false
val wsk = new Wsk(usePythonCLI)
val defaultAction = Some(TestUtils.getCatalogFilename("samples/hello.js"))
......
......@@ -33,7 +33,7 @@ class WskSdkTests
with WskTestHelpers {
implicit val wskprops = WskProps()
var usePythonCLI = true
var usePythonCLI = false
val wsk = new Wsk(usePythonCLI)
behavior of "Wsk SDK"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment