Make manifests_util use new exceptions

Signed-off-by: Adam Cmiel <acmiel@redhat.com>

omps/manifests_util.py

@@ -11,7 +11,7 @@
 import yaml
 
 from operatorcourier.api import build_and_verify
-from omps.errors import QuayCourierError
+from omps.errors import raise_for_courier_exception
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +31,7 @@ def from_dir(cls, source_dir_path):
             bundle = build_and_verify(source_dir_path)
         except Exception as e:
             msg = "Operator courier failed: {}".format(e)
-            raise QuayCourierError(msg)
+            raise_for_courier_exception(e, new_msg=msg)
         return cls(bundle)
 
     def __init__(self, bundle):

tests/test_manifest_util.py

@@ -7,7 +7,7 @@
 
 import pytest
 
-from omps.errors import QuayCourierError
+from omps.errors import PackageValidationError
 from omps.manifests_util import ManifestBundle
 
 
@@ -18,10 +18,12 @@ def test_invalid_bundle(self):
         """Test if proper exception is raised when source data are invalid.
         Uses empty dir to force operator-courier to raise an exception
         """
-        with pytest.raises(QuayCourierError), \
+        with pytest.raises(PackageValidationError) as exc_info, \
                 tempfile.TemporaryDirectory() as tmpdir:
             ManifestBundle.from_dir(tmpdir)
 
+        assert str(exc_info.value).startswith('Operator courier failed: ')
+
     def test_package_name(self, valid_manifest_dir):
         """Test of property which provides package name"""
         mb = ManifestBundle.from_dir(valid_manifest_dir.path)