From 206a718ee77991b18b0b1f8e2312b2f33334eb07 Mon Sep 17 00:00:00 2001
From: Ben Gourley <bn@grly.me>
Date: Fri, 18 Dec 2020 10:01:03 +0000
Subject: [PATCH] test: Skip tests failing due to change in Travis env

---
 features/ndk_app_legacy.feature | 4 ++++
 features/proxy.feature          | 1 +
 features/support/env.rb         | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/features/ndk_app_legacy.feature b/features/ndk_app_legacy.feature
index d4b19b6e6f..22540f1933 100644
--- a/features/ndk_app_legacy.feature
+++ b/features/ndk_app_legacy.feature
@@ -1,6 +1,7 @@
 Feature: Plugin integrated in NDK app
 
 @skip_agp4_0_or_higher
+@skip_agp3_4_0
 Scenario: NDK apps send requests
     When I build the NDK app
     And I wait to receive 6 requests
@@ -26,6 +27,7 @@ Scenario: NDK apps send requests
         | java.lang.String doSomething() |
 
 @skip_agp4_0_or_higher
+@skip_agp3_4_0
 Scenario: Custom projectRoot is added to payload
     When I set environment variable "PROJECT_ROOT" to "/repos/custom/my-app"
     And I build the NDK app
@@ -48,6 +50,7 @@ Scenario: Custom projectRoot is added to payload
 
 # Sets a non-existent objdump location for x86 and arm64-v8a, delivery should proceed as normal for other files
 @skip_agp4_0_or_higher
+@skip_agp3_4_0
 Scenario: Custom objdump location
     When I set environment variable "OBJDUMP_LOCATION" to "/fake/objdump"
     And I build the NDK app
@@ -67,6 +70,7 @@ Scenario: Custom objdump location
         | com.bugsnag.android.ndkapp |
 
 @skip_agp4_0_or_higher
+@skip_agp3_4_0
 Scenario: Mapping files uploaded for custom sharedObjectPaths
     When I set environment variable "USE_SHARED_OBJECT_PATH" to "true"
     When I build the NDK app
diff --git a/features/proxy.feature b/features/proxy.feature
index f59ae268f6..284cb84361 100644
--- a/features/proxy.feature
+++ b/features/proxy.feature
@@ -40,6 +40,7 @@ Scenario: Authenticated HTTP proxy without creds
     And I should receive no requests
 
 @skip_agp4_0_or_higher
+@skip_agp3_4_0
 Scenario: NDK request for basic HTTP proxy AGP < 4
     When I start an http proxy
     And I set the fixture JVM arguments to "-Dhttp.proxyHost=localhost -Dhttp.proxyPort=9000 -Dhttp.nonProxyHosts="
diff --git a/features/support/env.rb b/features/support/env.rb
index cff28b44a8..1af0b4e84d 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -31,6 +31,10 @@
   skip_this_scenario if is_above_or_equal_to_target(410)
 end
 
+Before('@skip_agp3_4_0') do |scenario|
+  skip_this_scenario if equals_target(340)
+end
+
 def equals_target(target)
   version = ENV["AGP_VERSION"].slice(0, 5)
   version = version.gsub(".", "")