Unify missing addons tests

Split the missing addons test to 2 tests - one for missing profile addon
and one for missing global addon.

Simplify the test by using minimal yaml instead of testing the valid
yaml, similar to other tests, and move the tests near other similar
tests.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>

test/drenv/envfile_test.py

@@ -63,11 +63,6 @@ def create_addons(tmpdir):
         tmpdir.mkdir(f"addon{i}")
 
 
-def test_validate_missing_addons(tmpdir):
-    with pytest.raises(envfile.MissingAddon):
-        f = io.StringIO(valid_yaml)
-        envfile.load(f, addons_root=str(tmpdir))
-
 
 def test_valid(tmpdir):
     create_addons(tmpdir)
@@ -186,6 +181,32 @@ def test_name_prefix(tmpdir):
     assert worker["addons"][0]["args"] == []
 
 
+def test_missing_profile_addons(tmpdir):
+    s = """
+name: test
+profiles:
+  - name: dr1
+    workers:
+      - addons:
+          - name: addon
+"""
+    with pytest.raises(envfile.MissingAddon):
+        envfile.load(io.StringIO(s), addons_root=str(tmpdir))
+
+
+def test_missing_global_addons(tmpdir):
+    s = """
+name: test
+profiles:
+  - name: dr1
+workers:
+  - addons:
+      - name: missing
+"""
+    with pytest.raises(envfile.MissingAddon):
+        envfile.load(io.StringIO(s), addons_root=str(tmpdir))
+
+
 def test_require_env_name():
     s = """
 profiles: []