From d50169b7c4975aee8c3048c301af05e70ee359c2 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Oct 06 2017 21:16:03 +0000 Subject: fix up test_complete_maven_build.py --- diff --git a/tests/test_hub/data/maven/import_1/files b/tests/test_hub/data/maven/import_1/files index 7fd043c..7f4bdde 100644 --- a/tests/test_hub/data/maven/import_1/files +++ b/tests/test_hub/data/maven/import_1/files @@ -17,4 +17,3 @@ packages/com.mycompany.app-my-app/1.0_SNAPSHOT/1/maven/com/mycompany/app/my-app/ packages/com.mycompany.app-my-app/1.0_SNAPSHOT/1/maven/com/mycompany/app/my-app/1.0-SNAPSHOT/my-app-1.0-SNAPSHOT-scm-sources.zip.sha1 packages/com.mycompany.app-my-app/1.0_SNAPSHOT/1/maven/com/mycompany/app/my-app/1.0-SNAPSHOT/my-app-1.0-SNAPSHOT-scm-sources.zip.md5 packages/com.mycompany.app-my-app/1.0_SNAPSHOT/1/maven/com/mycompany/app/my-app/1.0-SNAPSHOT/my-app-1.0-SNAPSHOT-scm-sources.zip -packages/com.mycompany.app-my-app/1.0_SNAPSHOT/1/metadata.json diff --git a/tests/test_hub/test_complete_maven_build.py b/tests/test_hub/test_complete_maven_build.py index 64a7c27..a2c327e 100644 --- a/tests/test_hub/test_complete_maven_build.py +++ b/tests/test_hub/test_complete_maven_build.py @@ -38,8 +38,8 @@ class TestCompleteMavenBuild(unittest.TestCase): mock.patch('kojihub._fetchSingle').start() mock.patch('kojihub.build_notification').start() mock.patch('kojihub.assert_policy').start() - mock.patch('kojihub.check_volume_policy', - return_value={'id':0, 'name': 'DEFAULT'}).start() + # mock.patch('kojihub.check_volume_policy', + # return_value={'id':0, 'name': 'DEFAULT'}).start() self.set_up_callbacks() def tearDown(self): @@ -130,14 +130,14 @@ class TestCompleteMavenBuild(unittest.TestCase): # check callbacks cbtypes = [c[0] for c in self.callbacks] cb_expect = [ - 'preBuildStateChange', # building -> completed - 'postBuildStateChange', 'preImport', # archive 1... 'postImport', 'preImport', # archive 2... 'postImport', 'preImport', # archive 3... 'postImport', + 'preBuildStateChange', # building -> completed + 'postBuildStateChange', ] self.assertEqual(cbtypes, cb_expect)