Add Loader argument to 'yaml.load' invocations as required by PyYAML 6.0.

Submitted upstream:

  https://github.com/ganeti/ganeti/pull/1668

diff --git a/qa/qa_utils.py b/qa/qa_utils.py
index da485df48..27428e685 100644
--- a/qa/qa_utils.py
+++ b/qa/qa_utils.py
@@ -450,7 +450,7 @@ def GetObjectInfo(infocmd):
   master = qa_config.GetMasterNode()
   cmdline = utils.ShellQuoteArgs(infocmd)
   info_out = GetCommandOutput(master.primary, cmdline)
-  return yaml.load(info_out)
+  return yaml.load(info_out, Loader=yaml.SafeLoader)
 
 
 def UploadFile(node, src):
diff --git a/test/py/ganeti.cli_unittest.py b/test/py/ganeti.cli_unittest.py
index 9cc980afa..242aac9fd 100755
--- a/test/py/ganeti.cli_unittest.py
+++ b/test/py/ganeti.cli_unittest.py
@@ -1141,14 +1141,15 @@ class TestFormatPolicyInfo(unittest.TestCase):
           self._RenameDictItem(minmax, key, keyparts[0])
     self.assertTrue(constants.IPOLICY_DTS in parsed)
     parsed[constants.IPOLICY_DTS] = yaml.load("[%s]" %
-                                              parsed[constants.IPOLICY_DTS])
+                                              parsed[constants.IPOLICY_DTS],
+                                              Loader=yaml.SafeLoader)
 
   @staticmethod
   def _PrintAndParsePolicy(custom, effective, iscluster):
     formatted = cli.FormatPolicyInfo(custom, effective, iscluster)
     buf = StringIO()
     cli._SerializeGenericInfo(buf, formatted, 0)
-    return yaml.load(buf.getvalue())
+    return yaml.load(buf.getvalue(), Loader=yaml.SafeLoader)
 
   def _PrintAndCheckParsed(self, policy):
     parsed = self._PrintAndParsePolicy(policy, NotImplemented, True)
>
<input type='hidden' name='id' value='560062aaeabb485e7f53f8f5e6449b9a35aa9ca2'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=560062aaeabb485e7f53f8f5e6449b9a35aa9ca2&amp;showmsg=1'>root</a>/<a href='/guix/log/tests?id=560062aaeabb485e7f53f8f5e6449b9a35aa9ca2&amp;showmsg=1'>tests</a>/<a href='/guix/log/tests/gremlin.scm?id=560062aaeabb485e7f53f8f5e6449b9a35aa9ca2&amp;showmsg=1'>gremlin.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/gremlin.scm?id=560062aaeabb485e7f53f8f5e6449b9a35aa9ca2'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2022-01-16 20:21:27 -0800'>2022-01-16</span></td><td class='logsubject'><a href='/guix/commit/tests/gremlin.scm?id=24c3485bb3ffc05e687ef6513ac287b8d3048bab'>tests: Fix file-needed/recursive on aarch64-linux.</a></td><td>Pierre Langlois</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes: &lt;https://issues.guix.gnu.org/52943&gt;.

* tests/gremlin.scm (file-needed/recursive)[ground-truth]: On aarch64-linux,
remove the dynamic linker from this list.


</td></tr>
<tr class='logheader'><td><span title='2022-01-14 22:39:24 +0100'>2022-01-14</span></td><td class='logsubject'><a href='/guix/commit/tests/gremlin.scm?id=e7ad192de008a6a21638def6eb973b9cc0c91116'>gremlin: Adjust tests for i686 and beyond.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes &lt;https://issues.guix.gnu.org/52752&gt;.
Reported by Denis 'GNUtoo' Carikli &lt;GNUtoo@cyberdimension.org&gt;.

* tests/gremlin.scm ("file-needed/recursive"): Augment the list of vDSO
names.


</td></tr>
<tr class='logheader'><td><span title='2022-01-08 15:51:22 -0800'>2022-01-08</span></td><td class='logsubject'><a href='/guix/commit/tests/gremlin.scm?id=6a2050b1e1c7f09ef9b6af43044b7c0e4786d39d'>tests: Fix file-needed/recursive on powerpc64le-linux.</a></td><td>Chris Marusich</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes: &lt;https://issues.guix.gnu.org/52940&gt;.

* tests/gremlin.scm (file-needed/recursive): Consider two entries to be
equivalent not when they are the same string, but rather when they refer to
the same file.
[ground-truth]: In addition to strings that begin with "linux-vdso.so", remove
strings that begin with "linux-vdso64.so".


</td></tr>
<tr class='logheader'><td><span title='2021-06-23 20:30:22 -0700'>2021-06-23</span></td><td class='logsubject'><a href='/guix/commit/tests/gremlin.scm?id=e4b5a23841bc6a92e2e21dd8b1038addee55eb02'>tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty.</a></td><td>Chris Marusich</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* tests/gremlin.scm (file-needed/recursive): Skip the test when (file-runpath
%guile-executable) evaluates to the empty list.  This causes the test to be
correctly skipped in the case where Guix has been built using a foreign
distro's toolchain and libraries.


</td></tr>
<tr class='logheader'><td><span title='2021-04-22 14:04:27 +0200'>2021-04-22</span></td><td class='logsubject'><a href='/guix/commit/tests/gremlin.scm?id=1010171280cb34c8dc361644b66fdd1a041d297a'>gremlin: 'elf-dynamic-info' returns a file name rathern than a dynamic entry.</a></td><td>Dion Mendel</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/build/gremlin.scm (elf-dynamic-info): Return the dynamic entry
value, not the dynamic entry.
* tests/gremlin.scm ("elf-dynamic-info-soname"): New test.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;


</td></tr>
<tr class='logheader'><td><span title='2020-12-01 21:30:28 +0100'>2020-12-01</span></td><td class='logsubject'><a href='/guix/commit/tests/gremlin.scm?id=53fd256e5ba43e516fb9d6eaf085b88fe8bd12b6'>gremlin: Add 'file-needed/recursive'.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/build/gremlin.scm (file-needed/recursive): New procedure.
* tests/gremlin.scm ("file-needed/recursive"): New test.


</td></tr>
<tr class='logheader'><td><span title='2020-09-19 17:28:46 +0200'>2020-09-19</span></td><td class='logsubject'><a href='/guix/commit/tests/gremlin.scm?id=49a1203d67a90a6a7ce4e4537697a6da96ceb213'>gremlin: Add 'set-file-runpath', 'file-runpath', and 'file-needed'.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/build/gremlin.scm (file-dynamic-info, file-runpath, file-needed):
New procedures.
(&amp;missing-runpath-error, &amp;runpath-too-long-error): New condition types.
(set-file-runpath): New procedure.
* tests/gremlin.scm ("set-file-runpath + file-runpath"): New test.


</td></tr>
<tr class='logheader'><td><span title='2019-05-18 12:10:15 +0200'>2019-05-18</span></td><td class='logsubject'><a href='/guix/commit/tests/gremlin.scm?id=6b97415996583b15a97dad8254f610275353e913'>gremlin: Adjust tests for foreign distros.</a></td><td>Ting-Wei Lan</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes &lt;https://bugs.gnu.org/35775&gt;.

* tests/gremlin.scm ("elf-dynamic-info-needed, executable"): Expect only
libguile and libc among NEEDED.
("strip-runpath"): Pass '--enable-new-dtags' to get RUNPATH, not RPATH.


</td></tr>