Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WinHPC launcher fixes #4350

Merged
merged 3 commits into from Oct 8, 2013
Merged

WinHPC launcher fixes #4350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e3f673
test WinHPC launchers on all platforms
minrk Oct 4, 2013
e0e2542
elementtree.tostring is always bytes
minrk Oct 4, 2013
e804880
passthrough kwargs in WinHPCTask `__init__` methods
minrk Oct 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions IPython/parallel/apps/winhpcjob.py
View file
Open in desktop
Expand Up @@ -145,7 +145,7 @@ def tostring(self):
"""Return the string representation of the job description XML."""
root = self.as_element()
indent(root)
txt = ET.tostring(root, encoding="utf-8")
txt = ET.tostring(root, encoding="utf-8").decode('utf-8')
# Now remove the tokens used to order the attributes.
txt = re.sub(r'_[A-Z]_','',txt)
txt = '<?xml version="1.0" encoding="utf-8"?>\n' + txt
Expand Down Expand Up @@ -264,8 +264,8 @@ class IPControllerTask(WinHPCTask):
unit_type = Unicode("Core", config=False)
work_directory = Unicode('', config=False)

def __init__(self, config=None):
super(IPControllerTask, self).__init__(config=config)
def __init__(self, **kwargs):
super(IPControllerTask, self).__init__(**kwargs)
the_uuid = uuid.uuid1()
self.std_out_file_path = os.path.join('log','ipcontroller-%s.out' % the_uuid)
self.std_err_file_path = os.path.join('log','ipcontroller-%s.err' % the_uuid)
Expand All @@ -292,8 +292,8 @@ class IPEngineTask(WinHPCTask):
unit_type = Unicode("Core", config=False)
work_directory = Unicode('', config=False)

def __init__(self, config=None):
super(IPEngineTask,self).__init__(config=config)
def __init__(self, **kwargs):
super(IPEngineTask,self).__init__(**kwargs)
the_uuid = uuid.uuid1()
self.std_out_file_path = os.path.join('log','ipengine-%s.out' % the_uuid)
self.std_err_file_path = os.path.join('log','ipengine-%s.err' % the_uuid)
Expand Down
18 changes: 13 additions & 5 deletions IPython/parallel/tests/test_launcher.py
View file
Open in desktop
Expand Up @@ -177,9 +177,17 @@ class TestSSHEngineLauncher(SSHTest, LauncherTest, TestCase):
# Windows Launcher Tests
#-------------------------------------------------------------------------------

if sys.platform.startswith("win"):
class TestWinHPCControllerLauncher(ControllerLauncherTest, TestCase):
launcher_class = launcher.WindowsHPCControllerLauncher
class WinHPCTest:
"""Tests for WinHPC Launchers"""
def test_batch_template(self):
launcher = self.build_launcher()
job_file = os.path.join(self.profile_dir, launcher.job_file_name)
self.assertEqual(launcher.job_file, job_file)
launcher.write_job_file(1)
self.assertTrue(os.path.isfile(job_file))

class TestWinHPCControllerLauncher(WinHPCTest, ControllerLauncherTest, TestCase):
launcher_class = launcher.WindowsHPCControllerLauncher

class TestWinHPCEngineSetLauncher(EngineSetLauncherTest, TestCase):
launcher_class = launcher.WindowsHPCEngineSetLauncher
class TestWinHPCEngineSetLauncher(WinHPCTest, EngineSetLauncherTest, TestCase):
launcher_class = launcher.WindowsHPCEngineSetLauncher