From a4cbbefc08e11005f1d648cbdef83a20ea593422 Mon Sep 17 00:00:00 2001
From: Lukas Holecek <hluk@email.cz>
Date: Feb 09 2022 10:47:27 +0000
Subject: Fix functional tests


---

diff --git a/functional-tests/conftest.py b/functional-tests/conftest.py
index 637f1f0..1dc4715 100644
--- a/functional-tests/conftest.py
+++ b/functional-tests/conftest.py
@@ -11,7 +11,9 @@ import subprocess
 import socket
 import pytest
 import requests
+
 from contextlib import contextmanager
+from mock import patch
 from sqlalchemy import create_engine
 
 from greenwave.logger import init_logging
@@ -60,6 +62,7 @@ def wait_for_listen(port):
 @contextmanager
 def server_subprocess(
         name, port, start_server_arguments,
+        api_base='/api/v1.0',
         source_path=None,
         settings_content=None, tmpdir_factory=None,
         dbname=None, init_db_arguments=None):
@@ -72,8 +75,11 @@ def server_subprocess(
     # creating test process.
     test_url_env_var = env_var_prefix + '_TEST_URL'
     if test_url_env_var in os.environ:
-        yield os.environ[test_url_env_var]
-        return
+        url = os.environ[test_url_env_var]
+        config = f'greenwave.config.TestingConfig.{env_var_prefix}_API_URL'
+        with patch(config, url + api_base):
+            yield url
+            return
 
     if source_path is None:
         default_source_path = os.path.join('..', name)
@@ -131,6 +137,7 @@ def resultsdb_server(tmpdir_factory):
     with server_subprocess(
             name='resultsdb',
             port=5001,
+            api_base='/api/v2.0',
             dbname=dbname,
             settings_content=settings_content,
             init_db_arguments=init_db_arguments,
diff --git a/functional-tests/test_api_v1.py b/functional-tests/test_api_v1.py
index 18012f0..0f0f84a 100644
--- a/functional-tests/test_api_v1.py
+++ b/functional-tests/test_api_v1.py
@@ -1069,7 +1069,7 @@ def test_validate_gating_yaml_obsolete_rule(requests_session, greenwave_server):
     assert result.status_code == 400
 
 
-def test_validate_gating_yaml_missing_tag(requests_session, greenwave_server):
+def test_validate_gating_yaml_missing_optional_tag(requests_session, greenwave_server):
     gating_yaml = dedent("""
         ---
         id: "test"
@@ -1081,8 +1081,7 @@ def test_validate_gating_yaml_missing_tag(requests_session, greenwave_server):
     """)
     result = requests_session.post(
         greenwave_server + 'api/v1.0/validate-gating-yaml', data=gating_yaml)
-    assert result.json().get('message') == "Missing !Policy tag"
-    assert result.status_code == 400
+    assert result.status_code == 200
 
 
 def test_validate_gating_yaml_missing_decision_context(requests_session, greenwave_server):