diff options
| -rwxr-xr-x | scripts/Controller.py | 4 | ||||
| -rwxr-xr-x | scripts/Expect.py | 14 | ||||
| -rw-r--r-- | scripts/Glacier2Util.py | 2 | ||||
| -rw-r--r-- | scripts/IceGridUtil.py | 2 | ||||
| -rw-r--r-- | scripts/IceStormUtil.py | 4 | ||||
| -rw-r--r-- | scripts/LocalDriver.py | 6 | ||||
| -rw-r--r-- | scripts/Util.py | 26 |
7 files changed, 29 insertions, 29 deletions
diff --git a/scripts/Controller.py b/scripts/Controller.py index 9ceaf015845..55de093b215 100755 --- a/scripts/Controller.py +++ b/scripts/Controller.py @@ -51,7 +51,7 @@ class ControllerDriver(Driver): if isinstance(platform, Darwin): # # On OS X, we set the trust settings on the certificate to prevent - # the Web browsers from prompting the user about the unstrusted + # the Web browsers from prompting the user about the untrusted # certificate. Some browsers such as Chrome don't provide the # option to set this trust settings. # @@ -271,4 +271,4 @@ class ControllerDriver(Driver): Driver.add("controller", ControllerDriver, default=True) -runTests()
\ No newline at end of file +runTests() diff --git a/scripts/Expect.py b/scripts/Expect.py index 0140a881d28..2bca42a14af 100755 --- a/scripts/Expect.py +++ b/scripts/Expect.py @@ -260,7 +260,7 @@ class reader(threading.Thread): if len(pattern) != olen: continue - # If no match and we have finished processing output rasise a TIMEOUT + # If no match and we have finished processing output raise a TIMEOUT if self._finish: raise TIMEOUT ('timeout exceeded in match\npattern: "%s"\nbuffer: "%s"\n' % (escape(s), escape(buf, False))) @@ -374,8 +374,8 @@ class Expect (object): if win32: # Don't rely on win32api - #import win32process - #creationflags = win32process.CREATE_NEW_PROCESS_GROUP) + # import win32process + # creationflags = win32process.CREATE_NEW_PROCESS_GROUP) # # universal_newlines = True is necessary for Python 3 on Windows # @@ -397,7 +397,7 @@ class Expect (object): # The thread is marked as a daemon thread. This is done so that if # an expect script runs off the end of main without kill/wait on each - # spawned process the script will not hang tring to join with the + # spawned process the script will not hang trying to join with the # reader thread. self.r.setDaemon(True) @@ -479,7 +479,7 @@ class Expect (object): raises a TIMEOUT exception. If timeout is None, the wait is indefinite. - The exit tus is returned. A negative exit status means + The exit status is returned. A negative exit status means the application was killed by a signal. """ if self.p is None: @@ -492,9 +492,9 @@ class Expect (object): while time.time() < end and self.p and self.p.poll() is None: time.sleep(0.1) if self.p and self.p.poll() is None: - raise TIMEOUT ('timedwait exceeded timeout') + raise TIMEOUT ('timed wait exceeded timeout') elif win32: - # We poll on Windows or othewise KeyboardInterrupt isn't delivered + # We poll on Windows or otherwise KeyboardInterrupt isn't delivered while self.p.poll() is None: time.sleep(0.5) diff --git a/scripts/Glacier2Util.py b/scripts/Glacier2Util.py index 81bdc050f67..a0f4fe585e4 100644 --- a/scripts/Glacier2Util.py +++ b/scripts/Glacier2Util.py @@ -26,7 +26,7 @@ class Glacier2Router(ProcessFromBinDir, Server): os.path.abspath(os.path.join(toplevel, "scripts", "icehashpassword.py"))) # - # For Linux ARM default rounds makes test slower (Usually runs on embbeded boards) + # For Linux ARM default rounds makes test slower (Usually runs on embedded boards) # if current.config.buildPlatform.find("arm") >= 0: command += " --rounds 100000" diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index e0444e858b4..bf5df85d50a 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -211,7 +211,7 @@ class IceGridTestCase(TestCase): TestCase.init(self, mapping, testsuite) # - # Add IceGrid servers at the begining of the server list, IceGrid needs to be + # Add IceGrid servers at the beginning of the server list, IceGrid needs to be # started first! # self.servers = self.icegridregistry + self.icegridnode + self.servers diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index 7aeb5ddd775..79b31006e1f 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.py @@ -63,7 +63,7 @@ class IceStorm(ProcessFromBinDir, Server): # icebox admin endpoint). # - # Manager, publish, node and admin ndpoints for given replica number + # Manager, publish, node and admin endpoints for given replica number manager = lambda replica: current.getTestEndpoint(self.portnum + replica * 4 + 0) publish = lambda replica: "{0}:{1}".format(current.getTestEndpoint(self.portnum + replica * 4 + 1), current.getTestEndpoint(self.portnum + replica * 4 + 1, "udp")) @@ -176,7 +176,7 @@ class IceStormTestCase(TestCase): TestCase.init(self, mapping, testsuite) # - # Add icestorm servers at the begining of the server list, IceStorm needs to be + # Add icestorm servers at the beginning of the server list, IceStorm needs to be # started first! # self.servers = self.icestorm + self.servers diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py index 799b1182f99..30003536088 100644 --- a/scripts/LocalDriver.py +++ b/scripts/LocalDriver.py @@ -75,7 +75,7 @@ class Executor: self.queueLength -= 1 # - # Worker threads dequeue and run testsuites. They push resuts to the results + # Worker threads dequeue and run testsuites. They push results to the results # queue. The thread stops when there are no more testsuite to dequeue. # resultList = [] @@ -390,7 +390,7 @@ class LocalDriver(Driver): else: print("Ran {0} tests in {1:02.2f} seconds".format(len(results), s)) if len(failures) > 0: - print("{0} suceeded and {1} failed:".format(len(results) - len(failures), len(failures))) + print("{0} succeeded and {1} failed:".format(len(results) - len(failures), len(failures))) for r in failures: print("- {0}".format(r.testsuite)) for (c, ex) in r.getFailed().items(): @@ -402,7 +402,7 @@ class LocalDriver(Driver): for i in range(max(4, len(lines) - 8), len(lines)): print(" " + lines[i]) else: - print("{0} suceeded".format(len(results))) + print("{0} succeeded".format(len(results))) if not self.loop: return 1 if len(failures) > 0 else 0 diff --git a/scripts/Util.py b/scripts/Util.py index 634f6c65b75..fc17e1f1463 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -367,7 +367,7 @@ class Mapping: print("--cprops=<properties> Specifies a list of additional client properties.") print("--sprops=<properties> Specifies a list of additional server properties.") print("--config=<config> Build configuration for native executables.") - print("--platform=<platform> Build plaform for native executables.") + print("--platform=<platform> Build platform for native executables.") def __init__(self, options=[]): # Build configuration @@ -432,7 +432,7 @@ class Mapping: for (k, v) in supportedOptions.items(): supportedOptions[k] = itertools.cycle(random.sample(v, len(v)) if rand else v) - # Now, for the length of the longuest array of values, we return + # Now, for the length of the longest array of values, we return # an array with the supported option combinations for i in range(0, length): options = [] @@ -703,7 +703,7 @@ class Mapping: def getDefaultProcess(self, processType, testsuite): # - # If no server or client is explictily set with a testcase, getDefaultProcess is called + # If no server or client is explicitly set with a testcase, getDefaultProcess is called # to figure out which process class to instantiate. Based on the processType and the testsuite # we instantiate the right default process class. # @@ -727,7 +727,7 @@ class Mapping: return self def getServerMapping(self): - # Can be overriden for client-only mapping that relies on another mapping for servers + # Can be overridden for client-only mapping that relies on another mapping for servers return self def getBinDir(self, process, current): @@ -999,7 +999,7 @@ class Process(Runnable): raise def waitForStart(self, current): - # To be overriden in specialization to wait for a token indiciating the process readyness. + # To be overridden in specialization to wait for a token indicating the process readiness. pass def stop(self, current, waitSuccess=False): @@ -1214,19 +1214,19 @@ class TestCase(Runnable): return self.options def setupServerSide(self, current): - # Can be overriden to perform setup activities before the server side is started + # Can be overridden to perform setup activities before the server side is started pass def teardownServerSide(self, current, success): - # Can be overriden to perform terddown after the server side is stopped + # Can be overridden to perform terddown after the server side is stopped pass def setupClientSide(self, current): - # Can be overriden to perform setup activities before the client side is started + # Can be overridden to perform setup activities before the client side is started pass def teardownClientSide(self, current, success): - # Can be overriden to perform terddown after the client side is stopped + # Can be overridden to perform terddown after the client side is stopped pass def startServerSide(self, current): @@ -1276,13 +1276,13 @@ class TestCase(Runnable): return self.getClientType() def getClientType(self): - # Overriden by test case specialization to specify the type of client to instantiate - # if no client is explictly provided + # Overridden by test case specialization to specify the type of client to instantiate + # if no client is explicitly provided return None def getServerType(self): - # Overriden by test case specialization to specify the type of client to instantiate - # if no server is explictly provided + # Overridden by test case specialization to specify the type of client to instantiate + # if no server is explicitly provided return None def getServerTestCase(self, cross=None): |