Backout 31ff0be74400
authorNick Thomas <nthomas@mozilla.com>
Wed, 27 Jan 2016 12:41:13 +1300 (2016-01-26)
changeset 4684 9b9b645d00a18c15c9db588391f431dc478526c1
parent 4683 360f6f0cf623db0007a2e7434b76148bf431ff42
child 4685 889eb503d966a693276e1d83a16ab32e72a8ef69
push id3934
push usernthomas@mozilla.com
push dateTue, 26 Jan 2016 23:45:09 +0000 (2016-01-26)
backs out31ff0be7440066870d47a84ebf3e1178f13124fe
Backout 31ff0be74400
process/factory.py
--- a/process/factory.py
+++ b/process/factory.py
@@ -1373,35 +1373,31 @@ class MercurialBuildFactory(MozillaBuild
                 machPath = '%(basedir)s/build/mach'
             # we need abs paths because we are in a non relative workdir
             printconfig_base_command = python + [
                 WithProperties(machPath), 'python',
                 WithProperties('%(basedir)s/build' + '%s/config/printconfigsetting.py' % self.mozillaSrcDir),
                 WithProperties('%(basedir)s/build' + '/%s/dist/bin/application.ini' % self.mozillaObjdir),
             ]
 
-            self.addStep(MockProperty(
+            self.addStep(SetProperty(
                 command=printconfig_base_command + ['App', 'BuildID'],
                 property='buildid',
                 workdir=printconfig_workdir,
                 env=printconfig_env,
                 description=['getting', 'buildid'],
                 descriptionDone=['got', 'buildid'],
-                mock=self.use_mock,
-                target=self.mock_target,
             ))
-            self.addStep(MockProperty(
+            self.addStep(SetProperty(
                 command=printconfig_base_command + ['App', 'SourceStamp'],
                 property='sourcestamp',
                 workdir=printconfig_workdir,
                 env=printconfig_env,
                 description=['getting', 'sourcestamp'],
-                descriptionDone=['got', 'sourcestamp'],
-                mock=self.use_mock,
-                target=self.mock_target,
+                descriptionDone=['got', 'sourcestamp']
             ))
             self._gotBuildInfo = True
 
     def addBuildAnalysisSteps(self):
         if self.platform in ('linux', 'linux64'):
             # Analyze the number of ctors
             def get_ctors(rc, stdout, stderr):
                 try:
@@ -1673,42 +1669,36 @@ class MercurialBuildFactory(MozillaBuild
         else:
             machPath = '%(basedir)s/build/mach'
         # we need abs paths because we are in a non relative workdir
         printconfig_base_command = python + [
             WithProperties(machPath), 'python',
             WithProperties('%(basedir)s/build' + '%s/config/printconfigsetting.py' % self.mozillaSrcDir),
             WithProperties('%(basedir)s/build' + '/%s/dist/bin/application.ini' % self.mozillaObjdir),
         ]
-        self.addStep(MockProperty(
+        self.addStep(SetProperty(
             command=printconfig_base_command + ['App', 'BuildID'],
             property='buildid',
             workdir=printconfig_workdir,
             env=printconfig_env,
             name='get_build_id',
-            mock=self.use_mock,
-            target=self.mock_target,
         ))
-        self.addStep(MockProperty(
+        self.addStep(SetProperty(
             command=printconfig_base_command + ['App', 'Version'],
             property='appVersion',
             workdir=printconfig_workdir,
             env=printconfig_env,
             name='get_app_version',
-            mock=self.use_mock,
-            target=self.mock_target,
         ))
-        self.addStep(MockProperty(
+        self.addStep(SetProperty(
             command=printconfig_base_command + ['App', 'Name'],
             property='appName',
             workdir=printconfig_workdir,
             env=printconfig_env,
             name='get_app_name',
-            mock=self.use_mock,
-            target=self.mock_target,
         ))
         self.pkg_env = pkg_env
 
     def addUploadSteps(self):
         if self.multiLocale:
             self.doUpload(postUploadBuildDir='en-US')
             cmd = ['python', '%s/%s' % (self.mozharness_path, self.multiLocaleScript),
                    '--config-file', self.multiLocaleConfig]