Merge pull request #969 from rust-lang/orchestrate-evaluate

Author: shepmaster

.github/workflows/ci.yml

@@ -319,6 +319,17 @@ jobs:
         killall -q ui || true
         chmod +x ./server/ui && ./server/ui &
         bundle exec rspec
+    - name: Run tests with feature flags
+      env:
+        PLAYGROUND_UI_ROOT: server/build/
+        PLAYGROUND_CORS_ENABLED: true
+        PLAYGROUND_GITHUB_TOKEN: "${{ secrets.PLAYGROUND_GITHUB_TOKEN }}"
+        PLAYGROUND_ORCHESTRATOR_ENABLED: 1
+        PLAYGROUND_EXECUTE_VIA_WEBSOCKET_THRESHOLD: 1.0
+      run: |-
+        killall -q ui || true
+        chmod +x ./server/ui && ./server/ui &
+        bundle exec rspec
     - name: Preserve screenshots
       if: "${{ failure() }}"
       uses: actions/upload-artifact@v3

ci/workflows.yml

@@ -447,6 +447,18 @@ workflows:
               chmod +x ./server/ui && ./server/ui &
               bundle exec rspec
 
+          - name: "Run tests with feature flags"
+            env:
+              PLAYGROUND_UI_ROOT: server/build/
+              PLAYGROUND_CORS_ENABLED: true
+              PLAYGROUND_GITHUB_TOKEN: ${{ secrets.PLAYGROUND_GITHUB_TOKEN }}
+              PLAYGROUND_ORCHESTRATOR_ENABLED: 1
+              PLAYGROUND_EXECUTE_VIA_WEBSOCKET_THRESHOLD: 1.0
+            run: |-
+              killall -q ui || true
+              chmod +x ./server/ui && ./server/ui &
+              bundle exec rspec
+
           - name: "Preserve screenshots"
             if: ${{ failure() }}
             uses: actions/upload-artifact@v3

tests/spec/features/navigation_spec.rb

@@ -30,7 +30,7 @@
     expect(page).to be_at_url('/')
   end
 
-  scenario "Navigating to help changes the URL", :flaky do
+  scenario "Navigating to help changes the URL" do
     visit '/'
     expect(page).to have_content('RUN')
 

ui/src/main.rs

@@ -179,7 +179,7 @@ impl MetricsToken {
 }
 
 #[derive(Debug, Snafu)]
-pub enum Error {
+enum Error {
     #[snafu(display("Sandbox creation failed: {}", source))]
     SandboxCreation { source: sandbox::Error },
     #[snafu(display("Compilation operation failed: {}", source))]
@@ -208,6 +208,23 @@ pub enum Error {
     Deserialization { source: serde_json::Error },
     #[snafu(display("Unable to serialize response: {}", source))]
     Serialization { source: serde_json::Error },
+
+    #[snafu(context(false))]
+    EvaluateRequest {
+        source: server_axum::api_orchestrator_integration_impls::ParseEvaluateRequestError,
+    },
+
+    #[snafu(context(false))]
+    CompileRequest {
+        source: server_axum::api_orchestrator_integration_impls::ParseCompileRequestError,
+    },
+
+    #[snafu(context(false))]
+    ExecuteRequest {
+        source: server_axum::api_orchestrator_integration_impls::ParseExecuteRequestError,
+    },
+
+    // Remove at a later point. From here ...
     #[snafu(display("The value {:?} is not a valid target", value))]
     InvalidTarget { value: String },
     #[snafu(display("The value {:?} is not a valid assembly flavor", value))]
@@ -224,6 +241,7 @@ pub enum Error {
     InvalidEdition { value: String },
     #[snafu(display("The value {:?} is not a valid crate type", value))]
     InvalidCrateType { value: String },
+    // ... to here
     #[snafu(display("No request was provided"))]
     RequestMissing,
     #[snafu(display("The cache has been poisoned"))]
@@ -241,6 +259,11 @@ pub enum Error {
         source: orchestrator::coordinator::Error,
     },
 
+    #[snafu(display("Unable to convert the evaluate request"))]
+    Evaluate {
+        source: orchestrator::coordinator::ExecuteError,
+    },
+
     #[snafu(display("Unable to convert the compile request"))]
     Compile {
         source: orchestrator::coordinator::CompileError,