Tests: only request a single core (#4572)

DataBiosphere · Sep 21, 2023 · 31c8c4e · 31c8c4e
1 parent 68932a1
commit 31c8c4e
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/src/toil/test/docs/scripts/tutorial_arguments.py b/src/toil/test/docs/scripts/tutorial_arguments.py
@@ -4,7 +4,7 @@
 
 class HelloWorld(Job):
     def __init__(self, message):
-        Job.__init__(self,  memory="2G", cores=2, disk="3G")
+        Job.__init__(self)
         self.message = message
 
     def run(self, fileStore):

diff --git a/src/toil/test/docs/scripts/tutorial_invokeworkflow.py b/src/toil/test/docs/scripts/tutorial_invokeworkflow.py
@@ -7,7 +7,7 @@
 
 class HelloWorld(Job):
     def __init__(self, message):
-        Job.__init__(self, memory="2G", cores=2, disk="3G")
+        Job.__init__(self)
         self.message = message
 
     def run(self, fileStore):

diff --git a/src/toil/test/docs/scripts/tutorial_invokeworkflow2.py b/src/toil/test/docs/scripts/tutorial_invokeworkflow2.py
@@ -6,7 +6,7 @@
 
 class HelloWorld(Job):
     def __init__(self, message):
-        Job.__init__(self,  memory="2G", cores=2, disk="3G")
+        Job.__init__(self)
         self.message = message
 
     def run(self, fileStore):

diff --git a/src/toil/test/docs/scripts/tutorial_multiplejobs.py b/src/toil/test/docs/scripts/tutorial_multiplejobs.py
@@ -2,7 +2,7 @@
 from toil.job import Job
 
 
-def helloWorld(job, message, memory="2G", cores=2, disk="3G"):
+def helloWorld(job, message):
     job.log(f"Hello world, I have a message: {message}")
 
 

diff --git a/src/toil/test/docs/scripts/tutorial_multiplejobs2.py b/src/toil/test/docs/scripts/tutorial_multiplejobs2.py
@@ -2,7 +2,7 @@
 from toil.job import Job
 
 
-def helloWorld(job, message, memory="2G", cores=2, disk="3G"):
+def helloWorld(job, message):
     job.log(f"Hello world, I have a message: {message}")
 
 

diff --git a/src/toil/test/docs/scripts/tutorial_multiplejobs3.py b/src/toil/test/docs/scripts/tutorial_multiplejobs3.py
@@ -2,7 +2,7 @@
 from toil.job import Job
 
 
-def helloWorld(job, message, memory="2G", cores=2, disk="3G"):
+def helloWorld(job, message):
     job.log(f"Hello world, I have a message: {message}")
 
 

diff --git a/src/toil/test/docs/scripts/tutorial_quickstart.py b/src/toil/test/docs/scripts/tutorial_quickstart.py
@@ -5,7 +5,7 @@
 from toil.job import Job
 
 
-def helloWorld(message, memory="2G", cores=2, disk="3G"):
+def helloWorld(message):
     return f"Hello, world!, here's a message: {message}"
 
 

diff --git a/src/toil/test/docs/scripts/tutorial_requirements.py b/src/toil/test/docs/scripts/tutorial_requirements.py
@@ -15,12 +15,12 @@ def parentJob(job):
     job.addFollowOn(analysis)
 
 
-def stageFn(job, url, cores=1):
+def stageFn(job, url):
     importedFile = job.fileStore.import_file(url)
     return importedFile, importedFile.size
 
 
-def analysisJob(job, fileStoreID, cores=2):
+def analysisJob(job, fileStoreID):
     # now do some analysis on the file
     pass
 

diff --git a/src/toil/test/docs/scripts/tutorial_staging.py b/src/toil/test/docs/scripts/tutorial_staging.py
@@ -7,7 +7,7 @@
 
 class HelloWorld(Job):
     def __init__(self, id):
-        Job.__init__(self, memory="2G", cores=2, disk="3G")
+        Job.__init__(self)
         self.inputFileID = id
 
     def run(self, fileStore):

diff --git a/src/toil/test/src/helloWorldTest.py b/src/toil/test/src/helloWorldTest.py
@@ -24,7 +24,7 @@ def testHelloWorld(self):
 
 class HelloWorld(Job):
     def __init__(self):
-        Job.__init__(self,  memory=100000, cores=2, disk="3G")
+        Job.__init__(self,  memory=100000, cores=1, disk="3G")
 
     def run(self, fileStore):
         fileID = self.addChildJobFn(childFn, cores=1, memory="1M", disk="3G").rv()

diff --git a/src/toil/test/src/realtimeLoggerTest.py b/src/toil/test/src/realtimeLoggerTest.py
@@ -57,7 +57,7 @@ def emit(self, record):
 
 class LogTest(Job):
     def __init__(self):
-        Job.__init__(self, memory=100000, cores=2, disk='3G')
+        Job.__init__(self, memory=100000, cores=1, disk='3G')
 
     def run(self, fileStore):
         RealtimeLogger.info('This should be logged at info level')

diff --git a/src/toil/test/src/toilContextManagerTest.py b/src/toil/test/src/toilContextManagerTest.py
@@ -61,10 +61,10 @@ def testExportAfterFailedExport(self):
 
 class HelloWorld(Job):
     def __init__(self):
-        Job.__init__(self, memory=100000, cores=2, disk='1M')
+        Job.__init__(self, memory=100000, disk='1M')
 
     def run(self, fileStore):
-        fileID = self.addChildJobFn(childFn, cores=1, memory='1M', disk='1M').rv()
+        fileID = self.addChildJobFn(childFn, memory='1M', disk='1M').rv()
         return self.addFollowOn(FollowOn(fileID)).rv()
 
 

diff --git a/src/toil/test/src/userDefinedJobArgTypeTest.py b/src/toil/test/src/userDefinedJobArgTypeTest.py
@@ -59,7 +59,7 @@ def _testFromMain(self):
 
 class JobClass(Job):
     def __init__(self, level, foo):
-        Job.__init__(self, memory=100000, cores=2, disk="300M")
+        Job.__init__(self, memory=100000, cores=1, disk="300M")
         self.level = level
         self.foo = foo