Skip to content

Commit

Permalink
Merge pull request #1237 from djmitche/bug2916
Browse files Browse the repository at this point in the history
correctly set the path module for p4 tests on windows
  • Loading branch information
sa2ajj committed Sep 29, 2014
2 parents 0844668 + 7606ec7 commit ca0a563
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions master/buildbot/test/unit/test_steps_source_p4.py
Expand Up @@ -27,6 +27,7 @@
from buildbot.test.util import sourcesteps
from buildbot.test.util.properties import ConstantRenderable
from twisted.internet import error
from twisted.python import reflect
from twisted.trial import unittest

_is_windows = (platform.system() == 'Windows')
Expand All @@ -48,6 +49,7 @@ def setupStep(self, step, args={}, patch=None, **kwargs):
workspace_dir = '/home/user/workspace'
if _is_windows:
workspace_dir = r'C:\Users\username\Workspace'
self.build.path_module = reflect.namedModule("ntpath")
self.properties.setProperty('builddir', workspace_dir, 'P4')

def test_no_empty_step_config(self):
Expand Down

0 comments on commit ca0a563

Please sign in to comment.