Merge pull request #192 from matyasselmeci/pr/fixall

Fix various errors from https://osg-sw-submit.chtc.wisc.edu/tests/20200722-1126/packages.html
opensciencegrid · Jul 22, 2020 · fe1ad85 · fe1ad85
2 parents 4432ed9 + 39857b8
commit fe1ad85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/osgtest/tests/test_280_gsiopenssh.py b/osgtest/tests/test_280_gsiopenssh.py
@@ -47,7 +47,7 @@ def test_01_set_config(self):
     def test_02_setup_selinux_port(self):
         if not core.state['selinux.mode']:
             self.skip_ok('SELinux disabled')
-        core.skip_ok_unless_installed("/usr/sbin/semanage", by_depenency=True)
+        core.skip_ok_unless_installed("/usr/sbin/semanage", by_dependency=True)
         port = core.config['gsisshd.port']
         core.check_system(['semanage', 'port', '--add', '-t', 'ssh_port_t', '--proto', 'tcp', port],
                           message="Allow [gsi]sshd to use port %s" % port)

diff --git a/osgtest/tests/test_550_condorce.py b/osgtest/tests/test_550_condorce.py
@@ -129,7 +129,7 @@ def test_07_ceview(self):
         core.skip_ok_unless_installed('htcondor-ce-view')
         view_url = 'http://%s:%s' % (core.get_hostname(), int(core.config['condor-ce.view-port']))
         try:
-            src = to_str(urlopen(view_url).read())
+            src = core.to_str(urlopen(view_url).read())
         except EnvironmentError as err:
             self.fail('Could not reach HTCondor-CE View at %s: %s' % (view_url, err))
         self.assert_(re.search(r'HTCondor-CE Overview', src), 'Failed to find expected CE View contents')