Backed out changeset 2104c6cc8081
authorRail Aliiev <rail@mozilla.com>
Thu, 22 Oct 2015 17:20:47 -0400 (2015-10-22)
changeset 4506 b9780f76d2b4e4b89808d6ba7f8db092ad540c9f
parent 4505 2104c6cc8081971e55b6555cacb0cf3c86b4cb57
child 4508 7927cf9b5417ce2b933d2adf157046eddb5c34b1
push id3768
push userraliiev@mozilla.com
push dateThu, 22 Oct 2015 21:20:52 +0000 (2015-10-22)
backs out2104c6cc8081971e55b6555cacb0cf3c86b4cb57
Backed out changeset 2104c6cc8081
process/factory.py
--- a/process/factory.py
+++ b/process/factory.py
@@ -1362,65 +1362,56 @@ class MercurialBuildFactory(MozillaBuild
                      mock_workdir_prefix=None,
                      ))
 
     def addBuildInfoSteps(self):
         """Helper function for getting build information into properties.
         Looks for self._gotBuildInfo to make sure we only run this set of steps
         once."""
         if not getattr(self, '_gotBuildInfo', False):
-            self.addStep(MockProperty(
+            self.addStep(SetProperty(
                 command=[
                     'python', 'build%s/config/printconfigsetting.py' % self.mozillaSrcDir,
                     'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
                     'App', 'BuildID'],
                 property='buildid',
                 workdir='.',
                 description=['getting', 'buildid'],
                 descriptionDone=['got', 'buildid'],
-                target=self.mock_target,
-                mock=self.use_mock,
-                mock_workdir_prefix=None
             ))
-            self.addStep(MockProperty(
+            self.addStep(SetProperty(
                 command=[
                     'python', 'build%s/config/printconfigsetting.py' % self.mozillaSrcDir,
                     'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
                     'App', 'SourceStamp'],
                 property='sourcestamp',
                 workdir='.',
                 description=['getting', 'sourcestamp'],
-                descriptionDone=['got', 'sourcestamp'],
-                target=self.mock_target,
-                mock=self.use_mock,
-                mock_workdir_prefix=None
+                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:
                     output = stdout.split("\t")
                     num_ctors = int(output[0])
                     testresults = [(
                         'num_ctors', 'num_ctors', num_ctors, str(num_ctors))]
                     return dict(num_ctors=num_ctors, testresults=testresults)
                 except:
                     return {'testresults': []}
 
-            self.addStep(MockProperty(
+            self.addStep(SetProperty(
                 name='get_ctors',
                 command=['python', WithProperties('%(toolsdir)s/buildfarm/utils/count_ctors.py'),
                          '%s/dist/bin/libxul.so' % self.mozillaObjdir],
                 extract_fn=get_ctors,
-                target=self.mock_target,
-                mock=self.use_mock,
-                mock_workdir_prefix=None,
             ))
 
             if self.graphServer:
                 self.addBuildInfoSteps()
                 self.addStep(
                     JSONPropertiesDownload(slavedest="properties.json"))
                 gs_env = self.env.copy()
                 gs_env['PYTHONPATH'] = WithProperties(
@@ -1639,64 +1630,52 @@ class MercurialBuildFactory(MozillaBuild
             ))
             if installerFilename:
                 self.addFilePropertiesSteps(filename=installerFilename,
                                             directory='build/%s/dist/install/sea' % self.mozillaObjdir,
                                             fileType='installer',
                                             haltOnFailure=True)
 
         if self.productName == 'xulrunner':
-            self.addStep(MockProperty(
+            self.addStep(SetProperty(
                 command=[
                     'python', 'build%s/config/printconfigsetting.py' % self.mozillaSrcDir,
                          'build/%s/dist/bin/platform.ini' % self.mozillaObjdir,
                          'Build', 'BuildID'],
                 property='buildid',
                 workdir='.',
                 name='get_build_id',
-                target=self.mock_target,
-                mock=self.use_mock,
-                mock_workdir_prefix=None,
             ))
         else:
-            self.addStep(MockProperty(
+            self.addStep(SetProperty(
                 command=[
                     'python', 'build%s/config/printconfigsetting.py' % self.mozillaSrcDir,
                          'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
                          'App', 'BuildID'],
                 property='buildid',
                 workdir='.',
                 name='get_build_id',
-                target=self.mock_target,
-                mock=self.use_mock,
-                mock_workdir_prefix=None,
             ))
-            self.addStep(MockProperty(
+            self.addStep(SetProperty(
                 command=[
                     'python', 'build%s/config/printconfigsetting.py' % self.mozillaSrcDir,
                          'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
                          'App', 'Version'],
                 property='appVersion',
                 workdir='.',
                 name='get_app_version',
-                target=self.mock_target,
-                mock=self.use_mock,
-                mock_workdir_prefix=None,
             ))
-            self.addStep(MockProperty(
+            self.addStep(SetProperty(
                 command=[
                     'python', 'build%s/config/printconfigsetting.py' % self.mozillaSrcDir,
                          'build/%s/dist/bin/application.ini' % self.mozillaObjdir,
                          'App', 'Name'],
                 property='appName',
                 workdir='.',
                 name='get_app_name',
-                target=self.mock_target,
-                mock=self.use_mock,
-                mock_workdir_prefix=None,
             ))
         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]
@@ -2158,31 +2137,28 @@ class NightlyBuildFactory(MercurialBuild
             filename='application.ini',
             directory='previous',
             filetype='file',
             max_depth=4,
             property_name='previous_inipath',
             workdir=self.absMozillaObjDir,
             haltOnFailure=True,
         ))
-        self.addStep(MockProperty(
+        self.addStep(SetProperty(
             name='set_previous_buildid',
             description=['set', 'previous', 'buildid'],
             doStepIf=self.previousMarExists,
             command=['python',
                      '%s/config/printconfigsetting.py' % self.absMozillaSrcDir,
                      WithProperties(
                          self.absMozillaObjDir + '/%(previous_inipath)s'),
                      'App', 'BuildID'],
             property='previous_buildid',
             workdir='.',
             haltOnFailure=True,
-            target=self.mock_target,
-            mock=self.use_mock,
-            mock_workdir_prefix=None,
         ))
         for dir in ['current', 'previous']:
             self.addStep(ShellCommand(
                 name='remove pgc files (%s)' % dir,
                 command="find . -name \*.pgc -print -delete",
                 env=updateEnv,
                 workdir="%s/%s" % (self.absMozillaObjDir, dir),
                 flunkOnFailure=False,
@@ -3590,51 +3566,42 @@ class NightlyRepackFactory(BaseRepackFac
             filename='application.ini',
             directory='dist/l10n-stage',
             filetype='file',
             max_depth=5,
             property_name='inipath',
             workdir=self.absMozillaObjDir,
             haltOnFailure=True,
         ))
-        self.addStep(MockProperty(
+        self.addStep(SetProperty(
             command=['python', '%s/config/printconfigsetting.py' % self.absMozillaSrcDir,
                      WithProperties('%s/' % self.absMozillaObjDir + '%(inipath)s'),
                      'App', 'BuildID'],
             name='get_build_id',
             workdir='.',
             env=self.env,
             property='buildid',
-            target=self.mock_target,
-            mock=self.use_mock,
-            mock_workdir_prefix=None,
         ))
-        self.addStep(MockProperty(
+        self.addStep(SetProperty(
             command=['python', '%s/config/printconfigsetting.py' % self.absMozillaSrcDir,
                      WithProperties('%s/' % self.absMozillaObjDir + '%(inipath)s'),
                      'App', 'Version'],
             property='appVersion',
             name='get_app_version',
             workdir='.',
             env=self.env,
-            target=self.mock_target,
-            mock=self.use_mock,
-            mock_workdir_prefix=None,
         ))
-        self.addStep(MockProperty(
+        self.addStep(SetProperty(
             command=['python', '%s/config/printconfigsetting.py' % self.absMozillaSrcDir,
                      WithProperties('%s/' % self.absMozillaObjDir + '%(inipath)s'),
                      'App', 'Name'],
             property='appName',
             name='get_app_name',
             workdir='.',
             env=self.env,
-            target=self.mock_target,
-            mock=self.use_mock,
-            mock_workdir_prefix=None,
         ))
 
         if self.l10nNightlyUpdate:
             self.addFilePropertiesSteps(filename='*.complete.mar',
                                         directory='%s/dist/update' % self.absMozillaObjDir,
                                         fileType='completeMar',
                                         haltOnFailure=True)
 
@@ -4289,25 +4256,22 @@ class MozillaTestFactory(MozillaBuildFac
         # Figure out build ID and TinderboxPrint revisions
         def get_build_info(rc, stdout, stderr):
             retval = {}
             stdout = "\n".join([stdout, stderr])
             m = re.search("^buildid: (\w+)", stdout, re.M)
             if m:
                 retval['buildid'] = m.group(1)
             return retval
-        self.addStep(MockProperty(
+        self.addStep(SetProperty(
                      command=['python', WithProperties('%(toolsdir)s/buildfarm/utils/printbuildrev.py'),
                               WithProperties('%(xredir)s')],
                      workdir='build',
                      extract_fn=get_build_info,
                      name='get build info',
-                     target=self.mock_target,
-                     mock=self.use_mock,
-                     mock_workdir_prefix=None,
                      ))
 
     def addSetupSteps(self):
         '''This stub is for implementing classes to do harness specific setup'''
         pass
 
     def addRunTestSteps(self):
         '''This stub is for implementing classes to do the actual test runs'''
@@ -4891,32 +4855,29 @@ class ScriptFactory(RequestSortingBuildF
                                  'hgtool.py')
             repository_manifest_path = \
                     os.path.join(self.tools_repo_cache,
                                 'buildfarm',
                                 'utils',
                                 'repository_manifest.py')
 
             if script_repo_manifest:
-                self.addStep(MockProperty(
+                self.addStep(SetProperty(
                     name="set_script_repo_url_and_script_repo_revision",
                     extract_fn=extractProperties,
                     command=['bash', '-c',
                         WithProperties(
                         'python %s ' % repository_manifest_path +
                         '--default-repo %s ' % scriptRepo +
                         '--default-revision %(script_repo_revision:-default)s ' +
                         '--default-checkout %s ' % self.script_repo_cache +
                         '--checkout %(basedir)s/scripts ' +
                         '--manifest-url %s' % script_repo_manifest)],
                     log_eval_func=rc_eval_func({0: SUCCESS, None: EXCEPTION}),
                     haltOnFailure=True,
-                    target=self.mock_target,
-                    mock=self.use_mock,
-                    mock_workdir_prefix=None,
                 ))
             else:
                 self.addStep(SetBuildProperty(
                     property_name='script_repo_checkout',
                     value=self.script_repo_cache,
                 ))
 
             hg_script_repo_env = self.env.copy()