P4: Use tools provided by CompositeStepMixin.

master/buildbot/steps/source/p4.py

@@ -98,7 +98,7 @@ def startVC(self, branch, revision, patch):
 
         self.revision = revision
         self.method = self._getMethod()
-        self.stdio_log = self.addLog("stdio")
+        self.stdio_log = self.addLogForRemoteCommands("stdio")
 
         d = self.checkP4()
 
@@ -130,10 +130,7 @@ def full(self, _):
         yield self._dovccmd(['sync', '#none'])
 
         # Then remove directory.
-        # NOTE: Not using CompositeStepMixin's runRmdir() as it requires self.rc_log
-        #       to be defined and ran into issues where setting that in _dovccmd would
-        #       yield multiple logs named 'stdio' in the waterfall report..
-        yield self._rmdir(self.workdir)
+        cmd = yield self.runRmdir(self.workdir)
 
         # Then we need to sync the client
         if self.revision:
@@ -355,13 +352,3 @@ def computeSourceRevision(self, changes):
             return None
         lastChange = max([int(c.revision) for c in changes])
         return lastChange
-
-    @defer.inlineCallbacks
-    def _rmdir(self, dir):
-        cmd = buildstep.RemoteCommand('rmdir',
-                                      {'dir': dir,
-                                       'logEnviron': self.logEnviron})
-        cmd.useLog(self.stdio_log, False)
-        yield self.runCommand(cmd)
-        if cmd.rc != 0:
-            raise buildstep.BuildStepFailed()