refactor app spec test nix commands

Author: thedavidmeister

Diff for: .circleci/config.yml

@@ -99,7 +99,7 @@ jobs:
       command: nix-shell --run 'aws dynamodb list-tables --endpoint-url=http://localhost:8000'
    - run:
        name: app spec tests
-       command: nix-shell --run hc-app-spec-test-sim1h
+       command: nix-shell --run 'hc-test-app-spec app_spec sim1h'
        no_output_timeout: 20m
 
  app-spec-tests-sim2h:
@@ -115,7 +115,7 @@ jobs:
          no_output_timeout: 20m
      - run:
          name: app spec tests
-         command: nix-shell --run hc-app-spec-test-sim2h
+         command: nix-shell --run 'hc-test-app-spec app_spec sim2h'
          no_output_timeout: 20m
 
  cluster-tests:
@@ -302,16 +302,10 @@ workflows:
    - fmt
    - app-spec-tests-sim1h
    - app-spec-tests-sim2h
-   # - app-spec-tests-memory
-   # - app-spec-tests-websocket
-   # @todo reimplement proc tests properly
-   # i.e. don't copy and paste app spec and expec it to work with stale state
-   # - app-spec-proc-tests
    - cluster-tests
    - cli-tests
    - wasm-conductor-tests
-   # @todo this was flakey
-   # - stress-tests-sim1h
+   - stress-tests-sim1h
    - stress-tests-sim2h
 
    - docker-build-minimal:

Diff for: app_spec/build_and_test.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -euxo pipefail
 mkdir -p dist
 
 echo "===================================================================================="
 echo "RUNNING cargo test for zomes"
-echo "Using conductor binary: `which holochain`"
-echo "Using cli binary:       `which hc`"
+echo "Using conductor binary: `command -v holochain`"
+echo "Using cli binary:       `command -v hc`"
 echo "------------------------------------------------------------------------------------"
 
 cargo test --manifest-path zomes/blog/code/Cargo.toml
@@ -29,4 +29,6 @@ cd test
 # more precisely symlinks are not supported without additional work on the host
 # e.g. https://superuser.com/questions/1115329/vagrant-shared-folder-and-symbolic-links-under-windows-10
 npm install --no-bin-links
-npm run test-ci
+if [[ -z ${HC_APP_SPEC_BUILD_RUN:-} ]]
+ then npm run test-ci
+fi

Diff for: app_spec/default.nix

@@ -2,6 +2,5 @@
 {
  buildInputs = []
  ++ (pkgs.callPackage ./cluster_test { }).buildInputs
- ++ (pkgs.callPackage ./test { }).buildInputs
  ;
 }

Diff for: app_spec/test/default.nix

@@ -0,0 +1 @@
+../app_spec/build_and_test.sh

Diff for: app_spec_proc_macro/build_and_test.sh

@@ -3,3 +3,4 @@ FROM holochain/holochain-rust:latest.${DOCKER_BRANCH}
 
 RUN nix-shell --run hc-cli-install
 RUN nix-shell --run hc-conductor-install
+RUN nix-shell --run 'HC_APP_SPEC_BUILD_RUN=1 hc-test-app-spec app_spec sim1h'

Diff for: app_spec_proc_macro/build_and_test.sh

@@ -4,3 +4,4 @@ FROM holochain/holochain-rust:latest.${DOCKER_BRANCH}
 RUN nix-shell --run hc-sim2h-server-install
 RUN nix-shell --run hc-cli-install
 RUN nix-shell --run hc-conductor-install
+RUN nix-shell --run 'HC_APP_SPEC_BUILD_RUN=1 hc-test-app-spec app_spec sim2h'

Diff for: docker/Dockerfile.circle.sim1h

@@ -0,0 +1,24 @@
+{ pkgs }:
+let
+
+ # (cd $app-spec-test-path && APP_SPEC_NETWORK_TYPE="$app-spec-test-network" ./build_and_test.sh);
+ hc-test-app-spec = pkgs.writeShellScriptBin "hc-test-app-spec" ''
+ set -euxo pipefail
+
+ export app_spec_test_path="''${1:-app_spec}"
+ export app_spec_test_network="''${2:-sim2h}"
+
+ hc-cli-install
+ hc-conductor-install
+
+ (cd $app_spec_test_path && APP_SPEC_NETWORK_TYPE="$app_spec_test_network" ./build_and_test.sh)
+
+ hc-cli-uninstall
+ hc-conductor-uninstall
+ '';
+in
+{
+ buildInputs = [
+  hc-test-app-spec
+ ];
+}

Diff for: docker/Dockerfile.circle.sim2h

@@ -16,5 +16,9 @@ in
  ++ (pkgs.callPackage ./fmt {
   pkgs = pkgs;
  }).buildInputs
+
+ ++ (pkgs.callPackage ./app-spec {
+  pkgs = pkgs;
+ }).buildInputs
  ;
 }