Skip to content

Commit

Permalink
Merge pull request #15 from matyasselmeci/fixtests
Browse files Browse the repository at this point in the history
Fix test_rpmbuild and test_mock_auto_cfg
  • Loading branch information
edquist authored Aug 4, 2016
2 parents 984eca7 + f02d9f8 commit 38a1e17
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions osgbuild/test/test_osgbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def test_rpmbuild(self):
try:
self.assertRegexpMatches(
out,
r'(?ms)INFO:osg-build:The following RPM[(]s[)] have been created:\n'
r'(?ms) >> The following RPM[(]s[)] have been created:\n'
r'[^\n]+'
r'yum-remove-osg-1[.]0-0[.]2[.]osg[.]el\d[.]noarch[.]rpm',
"rpm created message not found")
Expand Down Expand Up @@ -299,10 +299,6 @@ def check_for_mock_group(self):
return False


def test_mock_auto_cfg(self):
if self.check_for_mock_group():
checked_osg_build(["mock", self.pkg_dir])

def test_mock_koji_cfg(self):
if self.check_for_mock_group():
checked_osg_build(["mock", self.pkg_dir, "--el6", "--mock-config-from-koji=osg-3.2-el6-build"])
Expand Down

0 comments on commit 38a1e17

Please sign in to comment.