From 8b11704641c5d007149e4a0b249b8b8e1d400790 Mon Sep 17 00:00:00 2001
From: Giulia Naponiello <gnaponie@redhat.com>
Date: Feb 06 2019 14:34:41 +0000
Subject: PackageSpecificBuild is obsolete, not deprecated


PackageSpecificBuild and FedoraAtomicCi (subclass of the first one)
are not deprecated, but not supported anymore. Fixing the error
message, to be sure to not create confusion.

---

diff --git a/functional-tests/test_api_v1.py b/functional-tests/test_api_v1.py
index 303fe3b..82b2de2 100644
--- a/functional-tests/test_api_v1.py
+++ b/functional-tests/test_api_v1.py
@@ -994,7 +994,7 @@ def test_validate_gating_yaml_empty(requests_session, greenwave_server):
     assert result.status_code == 400
 
 
-def test_validate_gating_yaml_deprecated_rule(requests_session, greenwave_server):
+def test_validate_gating_yaml_obsolete_rule(requests_session, greenwave_server):
     gating_yaml = dedent("""
         --- !Policy
         id: "test"
@@ -1010,7 +1010,7 @@ def test_validate_gating_yaml_deprecated_rule(requests_session, greenwave_server
     result = requests_session.post(
         greenwave_server + 'api/v1.0/validate-gating-yaml', data=gating_yaml)
     assert result.json().get('message') == (
-        'Policy \'test\': Attribute \'rules\': !PackageSpecificBuild is deprecated. '
+        'Policy \'test\': Attribute \'rules\': !PackageSpecificBuild is obsolete. '
         'Please use the "packages" whitelist instead.')
     assert result.status_code == 400
 
diff --git a/greenwave/policies.py b/greenwave/policies.py
index 4a6578f..b04e3b5 100644
--- a/greenwave/policies.py
+++ b/greenwave/policies.py
@@ -494,9 +494,9 @@ class PassingTestCaseRule(Rule):
                                 self.scenario, result['id'])
 
 
-class DeprecatedRule(Rule):
+class ObsoleteRule(Rule):
     """
-    The base class for a deprecated rule.
+    The base class for an obsolete rule.
     When these rules are parsed, a SafeYAMLError exception will be raised.
     """
     advice = 'Please refer to the documentation for more information.'
@@ -504,13 +504,13 @@ class DeprecatedRule(Rule):
 
     def __init__(self):
         tag = self.yaml_tag or '!' + type(self).__name__
-        raise SafeYAMLError('{} is deprecated. {}'.format(tag, self.advice))
+        raise SafeYAMLError('{} is obsolete. {}'.format(tag, self.advice))
 
     def check(self, policy, product_version, subject_identifier, results_retriever, waivers):
-        raise ValueError('This rule is deprecated and can\'t be checked')
+        raise ValueError('This rule is obsolete and can\'t be checked')
 
 
-class PackageSpecificBuild(DeprecatedRule):
+class PackageSpecificBuild(ObsoleteRule):
     yaml_tag = '!PackageSpecificBuild'
     advice = 'Please use the "packages" whitelist instead.'