aws-crt 0.1.5 → 0.1.6

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/run

@@ -29,33 +29,6 @@ DESCRIPTION = "Execute a single Litani run and test the resulting run.json"
 EPILOG = "See test/e2e/README for the organization of this test suite"
 
 
-def get_args():
-    pars = argparse.ArgumentParser(description=DESCRIPTION, epilog=EPILOG)
-    for arg in [{
-            "flags": ["--test-file"],
-            "required": True,
-            "type": pathlib.Path,
-            "help": "file under test/e2e/tests containing test definition",
-    }, {
-            "flags": ["--litani"],
-            "required": True,
-            "type": pathlib.Path,
-            "help": "path to Litani under test",
-    }, {
-            "flags": ["--run-dir"],
-            "required": True,
-            "type": pathlib.Path,
-            "help": "a fresh directory in which Litani will be run",
-    }, {
-            "flags": ["--operation"],
-            "required": True,
-            "choices": ["init", "add-jobs", "run-build", "check-run"],
-    }]:
-        flags = arg.pop("flags")
-        pars.add_argument(*flags, **arg)
-    return pars.parse_args()
-
-
 def run_cmd(cmd):
     cmd_list = [str(c) for c in cmd]
     print(" ".join(cmd_list))
@@ -106,6 +79,25 @@ def add_jobs(litani, run_dir, mod):
             litani, "add-job", *job.get("args", []), **job.get("kwargs", {}))
 
 
+def transform_jobs(litani, run_dir, mod):
+    os.chdir(run_dir)
+    proc = subprocess.Popen(
+        [litani, "transform-jobs"], stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE, text=True, bufsize=0)
+
+    old_jobs = json.loads(proc.stdout.read())
+    new_jobs = mod.transform_jobs(old_jobs)
+
+    print(json.dumps(new_jobs), file=proc.stdin)
+    proc.stdin.flush()
+    proc.stdin.close()
+
+    proc.wait()
+    if proc.returncode:
+        logging.error("Return code: %d", proc.returncode)
+        sys.exit(1)
+
+
 def run_build(litani, run_dir, mod):
     os.chdir(run_dir)
     args = mod.get_run_build_args()
@@ -131,6 +123,42 @@ def add_global_context(args):
     os.environ["LITANI_E2E_LITANI_PATH"] = str(args.litani.resolve())
 
 
+OPERATIONS = {
+    "init": init,
+    "add-jobs": add_jobs,
+    "run-build": run_build,
+    "check-run": check_run,
+    "transform-jobs": transform_jobs,
+}
+
+
+def get_args():
+    pars = argparse.ArgumentParser(description=DESCRIPTION, epilog=EPILOG)
+    for arg in [{
+            "flags": ["--test-file"],
+            "required": True,
+            "type": pathlib.Path,
+            "help": "file under test/e2e/tests containing test definition",
+    }, {
+            "flags": ["--litani"],
+            "required": True,
+            "type": pathlib.Path,
+            "help": "path to Litani under test",
+    }, {
+            "flags": ["--run-dir"],
+            "required": True,
+            "type": pathlib.Path,
+            "help": "a fresh directory in which Litani will be run",
+    }, {
+            "flags": ["--operation"],
+            "required": True,
+            "choices": list(OPERATIONS.keys())
+    }]:
+        flags = arg.pop("flags")
+        pars.add_argument(*flags, **arg)
+    return pars.parse_args()
+
+
 def main():
     args = get_args()
     logging.basicConfig(format="run-tests: %(message)s")
@@ -139,12 +167,7 @@ def main():
 
     mod = get_test_module(args.test_file)
 
-    {
-        "init": init,
-        "add-jobs": add_jobs,
-        "run-build": run_build,
-        "check-run": check_run,
-    }[args.operation](args.litani, args.run_dir, mod)
+    OPERATIONS[args.operation](args.litani, args.run_dir, mod)
 
 
 if __name__ == "__main__":

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/custom_stages.py

@@ -1,4 +1,5 @@
 NUM_STAGES = 4
+SLOW = False
 
 def get_stages():
     stages = []

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/cwd.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = False
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/dump_run.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 import json
 import os

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/graph_line_break.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = False
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/html_node.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = False
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/job_id_env.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = False
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/multiproc_dump_run.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 import json
 import os

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/no_pool_serialize.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = False
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/no_pool_serialize_graph.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/no_timed_out.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = False
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/no_timed_out_timeout_ignored.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = False
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/no_timed_out_timeout_ok.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/pipeline_order.py

@@ -0,0 +1,53 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+SLOW = True
+EXPECTED_PIPELINE_NAMES = ["zeta", "0", "00", "01", "1", "Beta", "alpha",
+    "beta", "beta1", "beta2", "betaa", "delta", "epsilon", "gamma"]
+
+
+def get_init_args():
+    return {
+        "kwargs": {
+            "project": "sorted_pipeline_names",
+        }
+    }
+
+
+def get_jobs():
+    jobs = []
+    jobs.append({
+        "kwargs": {
+            "command": "/usr/bin/false",
+            "ci-stage": "build",
+            "pipeline": EXPECTED_PIPELINE_NAMES[0],
+        }
+    })
+    for pipeline in EXPECTED_PIPELINE_NAMES[1:]:
+        job = {
+            "kwargs": {
+                "command": "/usr/bin/true",
+                "ci-stage": "build",
+                "pipeline": pipeline,
+            }
+        }
+        jobs.append(job)
+    return jobs
+
+
+def get_run_build_args():
+    return {}
+
+
+def check_run(run):
+    return [p["name"] for p in run["pipelines"]] == EXPECTED_PIPELINE_NAMES

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/pool_serialize.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/pool_serialize_graph.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/single_pool.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = False
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/timed_out.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/timed_out_subprocess.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/timed_out_subprocess_multi_shell.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/timed_out_subprocess_shell.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/timed_out_timeout_ignored.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/timed_out_timeout_ok.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = True
 
 def get_init_args():
     return {

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/transform_delete_job.py

@@ -0,0 +1,54 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+SLOW = False
+
+def get_init_args():
+    return {
+        "kwargs": {
+            "project": "foo",
+        }
+    }
+
+
+def get_jobs():
+    return [{
+        "kwargs": {
+            "command": "echo foo",
+            "ci-stage": "build",
+            "pipeline": "foo",
+        }
+    }, {
+        "kwargs": {
+            "command": "echo bar",
+            "ci-stage": "build",
+            "pipeline": "foo",
+        }
+    }]
+
+
+def transform_jobs(jobs):
+    new_jobs = []
+    for job in jobs:
+        if job["command"] != "echo bar":
+            new_jobs.append(job)
+    return new_jobs
+
+
+def get_run_build_args():
+    return {}
+
+
+def check_run(run):
+    jobs = run["pipelines"][0]["ci_stages"][0]["jobs"]
+    return all((len(jobs) == 1, jobs[0]["stdout"][0].strip() == "foo"))

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/transform_modify_job.py

@@ -0,0 +1,46 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+SLOW = False
+
+def get_init_args():
+    return {
+        "kwargs": {
+            "project": "foo",
+        }
+    }
+
+
+def get_jobs():
+    return [{
+        "kwargs": {
+            "command": "echo foo",
+            "ci-stage": "build",
+            "pipeline": "foo",
+        }
+    }]
+
+
+def transform_jobs(jobs):
+    new_jobs = list(jobs)
+    new_jobs[0]["command"] = "echo bar"
+    return new_jobs
+
+
+def get_run_build_args():
+    return {}
+
+
+def check_run(run):
+    job = run["pipelines"][0]["ci_stages"][0]["jobs"][0]
+    return job["stdout"][0].strip() == "bar"

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/transform_no_change_job.py

@@ -0,0 +1,44 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License").
+# You may not use this file except in compliance with the License.
+# A copy of the License is located at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# or in the "license" file accompanying this file. This file is distributed
+# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+# express or implied. See the License for the specific language governing
+# permissions and limitations under the License.
+
+SLOW = False
+
+def get_init_args():
+    return {
+        "kwargs": {
+            "project": "foo",
+        }
+    }
+
+
+def get_jobs():
+    return [{
+        "kwargs": {
+            "command": "echo foo",
+            "ci-stage": "build",
+            "pipeline": "foo",
+        }
+    }]
+
+
+def transform_jobs(jobs):
+    return list(jobs)
+
+
+def get_run_build_args():
+    return {}
+
+
+def check_run(run):
+    job = run["pipelines"][0]["ci_stages"][0]["jobs"][0]
+    return job["stdout"][0].strip() == "foo"

data/aws-crt-ffi/crt/s2n/tests/litani/test/e2e/tests/zero_pool.py

@@ -11,6 +11,7 @@
 # express or implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
+SLOW = False
 
 def get_init_args():
     return {