Resolve failing BDD tests.

.travis.yml

@@ -180,8 +180,6 @@ before_install:
       mkdir -p $HOME/buildout-cache/{eggs,downloads};
       scripts/misc/geoserver_server_setup.sh before_install;
       scripts/misc/qgis_server_setup.sh before_install;
-      chmod +x scripts/misc/bdd_setup.sh;
-      scripts/misc/bdd_setup.sh before_install;
     fi
 
 install:
@@ -222,7 +220,6 @@ before_script:
       scripts/misc/geoserver_server_setup.sh before_script;
       echo "For QGIS Server Travis steps";
       scripts/misc/qgis_server_setup.sh before_script;
-      scripts/misc/bdd_setup.sh before_script;
       echo "Start NGINX server";
       sudo nginx -s stop;
       sudo nginx -c `pwd`/scripts/misc/nginx_integration.conf;

geonode/tests/bdd/conftest.py

@@ -51,7 +51,7 @@ def pytest_configure():
 
 
 @pytest.fixture(scope='function', autouse=True)
-def bdd_server(request):
+def bdd_server(request, live_server):
     """
         Workaround inspired by
         https://github.com/mozilla/addons-server/pull/4875/files#diff-0223c02758be2ac7967ea22c6fa4b361R96
@@ -71,7 +71,7 @@ def bdd_server(request):
         else:
             os.environ['DJANGO_LIVE_TEST_SERVER_ADDRESS'] = siteurl_fqdn
 
-    return live_server(request)
+    return live_server
 
 
 @pytest.fixture(scope='function', autouse=True)

geonode/tests/bdd/e2e/test_login.py

@@ -27,14 +27,14 @@
 
 # https://github.com/pytest-dev/pytest-django/issues/329
 @pytest.mark.django_db(transaction=True)  # , serialized_rollback=True)
-@scenario('login.feature', 'User can access login page')
+@scenario('features/login.feature', 'User can access login page')
 def test_user_can_access_login_page(db, geonode_db_setup):
     """User can access login page."""
     # pass
 
 
 @pytest.mark.django_db(transaction=True)  # , serialized_rollback=True)
-@scenario('login.feature', 'Admin user')
+@scenario('features/login.feature', 'Admin user')
 def test_admin_user():
     """Admin user."""
     # pass