adding --tags=~@use_splinter_client

.travis.yml

@@ -12,7 +12,7 @@ install:
   - pip install -q -r requirements_for_tests.txt --use-mirrors
 # command to run tests
 env:
-  - SKIP_SPLINTER_TESTS=0
+  - SKIP_SPLINTER_TESTS=1
 script:
   - ./run_tests.sh
 after_script:

features/contrib/evl_upload.feature

@@ -2,9 +2,6 @@
 @use_splinter_client
 Feature: EVL Upload
 
-    # NOTE: this test is WIP because even though it runs fine in our development environments,
-    # Travis has a problem when running it: 'Assertion Failed: Expected: <71> but: was <0>'
-    @wip
     Scenario: Upload call center volumes
        Given a file named "CEG Data.xlsx" with fixture "contrib/CEG Transaction Tracker.xlsx"
          and I have a bucket named "evl_ceg_data"
@@ -106,3 +103,4 @@ Feature: EVL Upload
              {"_timestamp": "2012-05-01T00:00:00+00:00", "transaction": "V-V890 SORN Declaration Vehicles Input", "service": "sorn", "volume": 0.0}
              {"_timestamp": "2012-06-01T00:00:00+00:00", "transaction": "V-V890 SORN Declaration Vehicles Triage", "service": "sorn", "volume": 0.0}
              """
+

features/environment.py

@@ -3,8 +3,6 @@
 import sys
 from backdrop.core.log_handler import get_log_file_handler
 from features.support.splinter_client import SplinterClient
-from features.support.support import BaseClient
-
 
 sys.path.append(
     os.path.join(os.path.dirname(__file__), '..')
@@ -56,10 +54,7 @@ def create_client(feature):
     if 'use_http_client' in feature.tags:
         return HTTPTestClient(config.DATABASE_NAME)
     if 'use_splinter_client' in feature.tags:
-        if os.getenv('SKIP_SPLINTER_TESTS'):
-            return BaseClient()
-        else:
-            return SplinterClient(config.DATABASE_NAME)
+        return SplinterClient(config.DATABASE_NAME)
 
     raise AssertionError(
         "Test client not selected! Please annotate the failing feature with "

run_tests.sh

@@ -41,7 +41,13 @@ display_result $? 1 "Unit tests"
 python -m coverage.__main__ xml --include=backdrop*
 
 # run feature tests
-behave --stop --tags=~@wip
+if [[ -z "$SKIP_SPLINTER_TESTS" ]]; then
+  echo "Not skipping splinter tests"
+  behave --stop --tags=~@wip
+else
+  echo "Skipping splinter tests"
+  behave --stop --tags=~@wip --tags=~@use_splinter_client
+fi
 display_result $? 2 "Feature tests"
 
 # run style checks