From ff4e7f2b6733c4d4e45a7ae90b0ac50dd9b7113c Mon Sep 17 00:00:00 2001
From: Sergi Delgado Segura <sergi.delgado.s@gmail.com>
Date: Mon, 20 Jan 2020 16:28:20 +0100
Subject: [PATCH] Adds pisa setup and e2e test run to circle-ci

---
 .circleci/config.yml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 253a4d8..da0ba21 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,7 +52,7 @@ jobs:
           name: Build bitcoin_sandbox
           command: |
             cp test/pisa/e2e/bitcoin.conf bitcoin_sandbox/
-            cp test/pisa/e2e/conf.py bitcoin_sandbox/bitcoin_sandbox/
+            cp test/pisa/e2e/sandbox-conf.py bitcoin_sandbox/bitcoin_sandbox/conf.py
             cp bitcoin_sandbox/docker/Dockerfile_ubuntu_no_ln bitcoin_sandbox/Dockerfile
             . venv/bin/activate
             cd bitcoin_sandbox && python -m bitcoin_sandbox.run_scenarios
@@ -81,6 +81,25 @@ jobs:
             . venv/bin/activate
             pytest test/apps/cli/unit
 
+      # Setup pisa for E2E testing
+      - run:
+          name: Setup pisa
+          command: |
+            . venv/bin/activate
+            cp test/pisa/e2e/pisa-conf.py pisa/conf.py
+            cd apps/
+            python3 -m generate_key
+            python3 -m generate_key -n cli
+
+
+      # Run E2E tests
+      - run:
+          name: Run e2e tests
+          command: |
+            . venv/bin/activate
+            python3 -m pisa.pisad &
+            pytest test/pisa/e2e/
+
       # - store_artifacts:
       #    path: test-reports
       #    destination: test-reports