Merge #131

131: Run end-to-end tests r=MikailBag a=MikailBag



Co-authored-by: Mikail Bagishov <bagishov.mikail@yandex.ru>

Author: bors[bot]

.github/workflows/pr.yaml

@@ -77,22 +77,25 @@ jobs:
   e2e:
     name: e2e
     runs-on: "ubuntu-18.04"
-    needs: build
-    if: "false" # TODO
     steps:
       - uses: actions/checkout@v1
-      - name: download jjs artifacts
-        uses: actions/download-artifact@v1
-        with:
-          name: dist.tgz
-          path: /opt/jjs
+      - run: bash scripts/ci-env.sh
+      - name: build
+        run: cargo jjs-build --docker
       - name: launch jjs
         run: docker-compose up --detach
+      - name: wait for launch
+        run: cargo run --package util
+        env:
+          JJS_WAIT: tcp://localhost:1779
+          RUST_LOG: util::wait=debug
       - name: run tests
         run: cargo jjs-test --integration-tests --skip-unit
       - name: collect logs
         if: always()
-        run: docker-compose logs > logs.txt
+        run: |
+          docker-compose logs --tail=all
+          docker-compose logs --tail=all > logs.txt
       - name: upload logs
         if: always()
         uses: actions/upload-artifact@v1

bors.toml

@@ -1,3 +1,3 @@
-status = ['style', 'clippy', 'cpp', 'unit-tests', 'build', 'udeps']
+status = ['style', 'clippy', 'cpp', 'unit-tests', 'build', 'udeps', 'e2e']
 delete-merged-branches = true
 timeout-sec = 1800

docker-compose.yml

@@ -14,7 +14,6 @@ services:
       - "--sample-contest"
       - "--db-url=postgres://db:5432/jjs"
       - "--toolchains"
-      - "--force"
       - "--touch=/var/jjs/done.txt"
     depends_on:
       - db

src/all/tests/judge.rs

@@ -8,7 +8,7 @@ fn submit(code: &str) -> i32 {
         .operation(
             r#"
 mutation Submit($runCode: String!) {
-  submitSimple(toolchain: "cpp", problem: "A", runCode: $runCode, contest: "TODO") {
+  submitSimple(toolchain: "g++", problem: "A", runCode: $runCode, contest: "TODO") {
     id
   }
 }

src/util/src/main.rs

@@ -0,0 +1,10 @@
+use util;
+
+fn main() {
+    util::log::setup();
+    println!(
+        "wait spec: {}",
+        std::env::var("JJS_WAIT").unwrap_or_default()
+    );
+    util::wait::wait();
+}