Merge pull request #75 from fastly/joeshaw/rm-viceroy-workaround

.github/workflows/integration-tests.yml

@@ -1,7 +1,7 @@
 name: Integration Tests
 on: [push]
 env:
-  VICEROY_VERSION: 0.6.0
+  VICEROY_VERSION: 0.6.1
 jobs:
   integration-tests:
     runs-on: ubuntu-latest

integration_tests/dynamic_backend/main_test.go

@@ -19,23 +19,13 @@ func NewBackendOptions() *fsthttp.BackendOptions {
 }
 
 func TestDynamicBackend(t *testing.T) {
-	var skip bool
-
 	handler := func(ctx context.Context, w fsthttp.ResponseWriter, r *fsthttp.Request) {
 		b, err := fsthttp.RegisterDynamicBackend(
 			"dynamic",
 			"compute-sdk-test-backend.edgecompute.app",
 			NewBackendOptions().UseSSL(true),
 		)
 		if err != nil {
-			// Remove this once Viceroy 0.6.1 is released, which fixes
-			// the error value.
-			if err.Error() == "Fastly error: Inval" {
-				// And we can't t.Skip() because that's not supported in TinyGo.
-				skip = true
-				return
-			}
-
 			t.Errorf("RegisterDynamicBackend: %v", err)
 			fsthttp.Error(w, err.Error(), fsthttp.StatusInternalServerError)
 			return
@@ -101,11 +91,6 @@ func TestDynamicBackend(t *testing.T) {
 
 	handler(context.Background(), w, r)
 
-	if skip {
-		t.Log("Skipping test due to Viceroy bug.  Remove this workaround once Viceroy 0.6.1 is released.")
-		return
-	}
-
 	if got, want := w.Code, fsthttp.StatusOK; got != want {
 		t.Errorf("Code = %d, want %d", got, want)
 	}