Merge pull request #172 from brianhlin/fix-osg-release

Fix obfuscated calls to osg_release()

Author: brianhlin

osgtest/tests/special_cleanup.py

@@ -69,8 +69,13 @@ def test_01_downgrade_osg_release(self):
         command = ['rpm', '-e', 'osg-release']
         core.check_system(command, 'Erase osg-release')
 
-        rpm_url = 'https://repo.opensciencegrid.org/osg/' + core.config['install.original-release-ver']+ '/osg-' + \
-            core.config['install.original-release-ver'] + '-el' + str(core.el_release()) + '-release-latest.rpm'
+        rpm_url = 'https://repo.opensciencegrid.org/osg/' \
+            + core.config['install.original-release-ver'] \
+            + '/osg-' \
+            + core.config['install.original-release-ver'] \
+            + '-el' \
+            + str(core.el_release()) \
+            + '-release-latest.rpm'
         command = ['rpm', '-Uvh', rpm_url]
         core.check_system(command, 'Downgrade osg-release')
 

osgtest/tests/special_install.py

@@ -15,7 +15,7 @@ def test_01_yum_repositories(self):
             core.check_system(pre + ('osg-release',), 'Verify osg-release')
         except AssertionError:
             core.check_system(pre + ('osg-release-itb',), 'Verify osg-release + osg-release-itb')
-        core.config['install.original-release-ver'] = core.osg_release()
+        core.config['install.original-release-ver'] = core.osg_release().version
 
     def test_02_install_packages(self):
         core.state['install.success'] = False