AMBARI-5428. failing testGenerateManifest, test_overwrite_repos (dlysnichenko)

ambari-agent/src/test/python/ambari_agent/TestManifestGenerator.py

@@ -63,21 +63,24 @@ class TestManifestGenerator(TestCase):
 
     pass
 
+  @patch.object(manifestGenerator, 'writeHostnames')
   @patch.object(manifestGenerator, 'writeImports')
   @patch.object(manifestGenerator, 'writeNodes')
   @patch.object(manifestGenerator, 'writeParams')
   @patch.object(manifestGenerator, 'writeTasks')
   @patch.object(manifestGenerator, 'decompressClusterHostInfo')
-  def testGenerateManifest(self, decompressClusterHostInfoMock, writeTasksMock, writeParamsMock, writeNodesMock, writeImportsMock):
+  def testGenerateManifest(self, decompressClusterHostInfoMock, writeTasksMock,
+                           writeParamsMock, writeNodesMock, writeImportsMock, writeHostnamesMock):
     tmpFileName = tempfile.mkstemp(dir=self.dir, text=True)[1]
     self.parsedJson['roleParams'] = 'role param'
     manifestGenerator.generateManifest(self.parsedJson, tmpFileName, '../../main/puppet/modules', self.config.getConfig())
 
-    self.assertTrue(writeParamsMock.called)
-    self.assertTrue(writeNodesMock.called)
+    self.assertTrue(decompressClusterHostInfoMock.called)
     self.assertTrue(writeImportsMock.called)
+    self.assertTrue(writeHostnamesMock.called)
+    self.assertTrue(writeNodesMock.called)
+    self.assertTrue(writeParamsMock.called)
     self.assertTrue(writeTasksMock.called)
-    self.assertTrue(decompressClusterHostInfoMock.called)
 
     print file(tmpFileName).read()
 

ambari-agent/src/test/python/ambari_agent/TestPuppetExecutor.py

@@ -113,10 +113,12 @@ class TestPuppetExecutor(TestCase):
     self.assertEquals(res["stderr"], "Cannot access JDK! Make sure java_home is specified in hostLevelParams")
 
 
+  @patch.object(manifestGenerator, 'generateManifest')
   @patch.object(PuppetExecutor, 'isJavaAvailable')
   @patch.object(RepoInstaller, 'generate_repo_manifests')
   @patch.object(PuppetExecutor, 'runPuppetFile')
-  def test_overwrite_repos(self, runPuppetFileMock, generateRepoManifestMock, isJavaAvailableMock):
+  def test_overwrite_repos(self, runPuppetFileMock, generateRepoManifestMock,
+                           isJavaAvailableMock, generateManifestMock):
     tmpdir = tempfile.gettempdir()
     puppetInstance = PuppetExecutor("/tmp", "/x", "/y", tmpdir, AmbariConfig().getConfig())
     jsonFile = open('../../main/python/ambari_agent/test.json', 'r')
@@ -124,6 +126,10 @@ class TestPuppetExecutor(TestCase):
     parsedJson = json.loads(jsonStr)
     parsedJson["taskId"] = 77
     parsedJson['roleCommand'] = "START"
+    def side_effect_generate_manifest(command, siteppFileName,
+                                      modulesdir, config):
+      return None
+    generateManifestMock.side_effect = side_effect_generate_manifest
     def side_effect(puppetFile, result, puppetEnv, tmpoutfile, tmperrfile, timeout):
       result["exitcode"] = 0
     runPuppetFileMock.side_effect = side_effect