Fix import and change to f-string

Author: joaorobson

tests/cli/test_rasa_data.py

@@ -3,7 +3,7 @@
 from collections import namedtuple
 from typing import Callable
 from _pytest.pytester import RunResult
-from rasa.cli.data import validate_files
+from rasa.cli import data
 
 
 def test_data_split_nlu(run_in_default_project: Callable[..., RunResult]):
@@ -71,7 +71,7 @@ def test_data_validate_help(run: Callable[..., RunResult]):
 def test_validate_files_exit_early():
     with pytest.raises(SystemExit) as pytest_e:
         args = {"domain": "data/test_domains/duplicate_intents.yml", "data": None}
-        validate_files(namedtuple("Args", args.keys())(*args.values()))
+        data.validate_files(namedtuple("Args", args.keys())(*args.values()))
 
     assert pytest_e.type == SystemExit
     assert pytest_e.value.code == 1

tests/core/test_validator.py

@@ -1,5 +1,4 @@
 import pytest
-import os
 from rasa.core.validator import Validator
 from rasa.importers.rasa import RasaFileImporter
 from tests.core.conftest import (
@@ -89,9 +88,8 @@ async def test_verify_logging_message_for_repetition_in_intents(caplog):
     )
 
 
-async def test_verify_domain_validity(caplog):
+async def test_early_exit_on_invalid_domain(caplog):
     domain_path = "data/test_domains/duplicate_intents.yml"
-    full_path = os.path.abspath(domain_path)
 
     importer = RasaFileImporter(domain_path=domain_path)
     validator = await Validator.from_importer(importer)
@@ -103,12 +101,9 @@ async def test_verify_domain_validity(caplog):
 
     assert "WARNING" == level
     assert (
-        "Loading domain from '{}' failed. Using empty domain. "
+        f"Loading domain from '{domain_path}' failed. Using empty domain. "
         "Error: 'Intents are not unique! Found two intents with name "
-        "'default'. Either rename or remove one of them.'".format(
-            domain_path, full_path
-        )
-        == message
+        "'default'. Either rename or remove one of them.'" == message
     )