rabbah closed pull request #3865: Modify unicode tests file name
URL: https://github.com/apache/incubator-openwhisk/pull/3865
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/actions-new.md b/docs/actions-new.md
index c7945d1a67..91704d755b 100644
--- a/docs/actions-new.md
+++ b/docs/actions-new.md
@@ -86,7 +86,8 @@ The standard test action is shown below in JavaScript. It
should be adapted for
new language and added to the [test artifacts
directory](../tests/dat/actions/unicode.tests)
with the name `<runtime-kind>.txt` for plain text file or `<runtime-kind>.bin`
for a
a binary file. The `<runtime-kind>` must match the value used for `kind` in
the corresponding
-runtime manifest entry.
+runtime manifest entry, replacing `:` in the kind with a `-`.
+For example, a plain text function for `nodejs:8` becomes `nodejs-8.txt`.
```js
function main(args) {
diff --git a/tests/dat/actions/unicode.tests/nodejs:6.txt
b/tests/dat/actions/unicode.tests/nodejs-6.txt
similarity index 100%
rename from tests/dat/actions/unicode.tests/nodejs:6.txt
rename to tests/dat/actions/unicode.tests/nodejs-6.txt
diff --git a/tests/dat/actions/unicode.tests/nodejs:8.txt
b/tests/dat/actions/unicode.tests/nodejs-8.txt
similarity index 100%
rename from tests/dat/actions/unicode.tests/nodejs:8.txt
rename to tests/dat/actions/unicode.tests/nodejs-8.txt
diff --git a/tests/dat/actions/unicode.tests/php:7.1.txt
b/tests/dat/actions/unicode.tests/php-7.1.txt
similarity index 100%
rename from tests/dat/actions/unicode.tests/php:7.1.txt
rename to tests/dat/actions/unicode.tests/php-7.1.txt
diff --git a/tests/dat/actions/unicode.tests/php:7.2.txt
b/tests/dat/actions/unicode.tests/php-7.2.txt
similarity index 100%
rename from tests/dat/actions/unicode.tests/php:7.2.txt
rename to tests/dat/actions/unicode.tests/php-7.2.txt
diff --git a/tests/dat/actions/unicode.tests/python:2.txt
b/tests/dat/actions/unicode.tests/python-2.txt
similarity index 100%
rename from tests/dat/actions/unicode.tests/python:2.txt
rename to tests/dat/actions/unicode.tests/python-2.txt
diff --git a/tests/dat/actions/unicode.tests/python:3.txt
b/tests/dat/actions/unicode.tests/python-3.txt
similarity index 100%
rename from tests/dat/actions/unicode.tests/python:3.txt
rename to tests/dat/actions/unicode.tests/python-3.txt
diff --git a/tests/dat/actions/unicode.tests/swift:3.1.1.txt
b/tests/dat/actions/unicode.tests/swift-3.1.1.txt
similarity index 100%
rename from tests/dat/actions/unicode.tests/swift:3.1.1.txt
rename to tests/dat/actions/unicode.tests/swift-3.1.1.txt
diff --git a/tests/dat/actions/unicode.tests/swift:4.1.txt
b/tests/dat/actions/unicode.tests/swift-4.1.txt
similarity index 100%
rename from tests/dat/actions/unicode.tests/swift:4.1.txt
rename to tests/dat/actions/unicode.tests/swift-4.1.txt
diff --git a/tests/src/test/scala/system/basic/WskUnicodeTests.scala
b/tests/src/test/scala/system/basic/WskUnicodeTests.scala
index f425418ca0..1000bc6523 100644
--- a/tests/src/test/scala/system/basic/WskUnicodeTests.scala
+++ b/tests/src/test/scala/system/basic/WskUnicodeTests.scala
@@ -59,7 +59,7 @@ class WskUnicodeTests extends TestHelpers with WskTestHelpers
with JsHelpers wit
def getFileLocation(kind: String): Option[String] = {
// the test file is either named kind.txt or kind.bin
// one of the two must exist otherwise, fail the test.
- val prefix = "unicode.tests" + File.separator + kind
+ val prefix = "unicode.tests" + File.separator + kind.replace(":", "-")
val txt = new File(TestUtils.getTestActionFilename(s"$prefix.txt"))
val bin = new File(TestUtils.getTestActionFilename(s"$prefix.bin"))
if (txt.exists) Some(txt.toString)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
