Merge pull request #600 from edsantiago/typo_fix_dependent

minor typo fixes

Author: cevich

subtests/docker_cli/run_attach/run_attach.py

@@ -60,11 +60,11 @@ def _init_container(self, tty, cmd, cmd_input='\n'):
             result = cmd.cmdresult
         return result
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         """
         Override this with your desired test setup.
         """
-        raise NotImplementedError("Override this methodin your test!")
+        raise NotImplementedError("Override this method in your test!")
 
     def _populate_expected_results(self):
         """
@@ -138,7 +138,7 @@ def initialize(self):
         config.none_if_empty(self.config)
         self.sub_stuff['dc'] = DockerContainers(self)
         self.sub_stuff['containers'] = []
-        self._init_test_depenent()
+        self._init_test_dependent()
         # TODO: Test w/ tty=True when some DockerCmd class supports pty
         # for tty in (True, False):   # generate matrix of tested variants
         tty = False
@@ -233,7 +233,7 @@ class none(run_attach_base):
     should fail.
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         self.sub_stuff['subargs'] = ['']
         self._populate_expected_results()
 
@@ -245,7 +245,7 @@ class stdin(run_attach_base):
     (prints the container's id)
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         self.sub_stuff['subargs'] = ['-a stdin']
         self._populate_expected_results()
 
@@ -256,7 +256,7 @@ class stdout(run_attach_base):
     Only stdout is attached, stdin fails and no output in stderr.
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         self.sub_stuff['subargs'] = ['-a stdout']
         self._populate_expected_results()
 
@@ -267,7 +267,7 @@ class stderr(run_attach_base):
     Only stderr is attached, stdin fails, no output in stdout.
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         self.sub_stuff['subargs'] = ['-a stderr']
         self._populate_expected_results()
 
@@ -278,7 +278,7 @@ class in_out(run_attach_base):
     stdin/stdout are attached, no output in stderr
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         self.sub_stuff['subargs'] = ['-a stdin', '-a stdout']
         self._populate_expected_results()
 
@@ -289,7 +289,7 @@ class in_err(run_attach_base):
     stdin/stderr are attached, no output in stdout
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         self.sub_stuff['subargs'] = ['-a stdin', '-a stderr']
         self._populate_expected_results()
 
@@ -300,7 +300,7 @@ class in_out_err(run_attach_base):
     All streams attached, output should be found in correct streams.
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         self.sub_stuff['subargs'] = ['-a stdin', '-a stdout', '-a stderr']
         self._populate_expected_results()
 
@@ -313,8 +313,8 @@ class i_stdin(stdin):
     :note: uses --interactive
     """
 
-    def _init_test_depenent(self):
-        super(i_stdin, self)._init_test_depenent()
+    def _init_test_dependent(self):
+        super(i_stdin, self)._init_test_dependent()
         self.sub_stuff['subargs'].append('--interactive')
 
 
@@ -325,8 +325,8 @@ class i_in_out(in_out):
     :note: uses --interactive
     """
 
-    def _init_test_depenent(self):
-        super(i_in_out, self)._init_test_depenent()
+    def _init_test_dependent(self):
+        super(i_in_out, self)._init_test_dependent()
         self.sub_stuff['subargs'].append('--interactive')
 
 
@@ -337,8 +337,8 @@ class i_in_err(in_err):
     :note: uses --interactive
     """
 
-    def _init_test_depenent(self):
-        super(i_in_err, self)._init_test_depenent()
+    def _init_test_dependent(self):
+        super(i_in_err, self)._init_test_dependent()
         self.sub_stuff['subargs'].append('--interactive')
 
 
@@ -349,6 +349,6 @@ class i_in_out_err(in_out_err):
     :note: uses --interactive
     """
 
-    def _init_test_depenent(self):
-        super(i_in_out_err, self)._init_test_depenent()
+    def _init_test_dependent(self):
+        super(i_in_out_err, self)._init_test_dependent()
         self.sub_stuff['subargs'].append('--interactive')

subtests/docker_cli/run_user/run_user.py

@@ -76,15 +76,15 @@ def _init_container(self, subargs, cmd):
         subargs.append(cmd)
         self.sub_stuff['cmd'] = DockerCmd(self, 'run', subargs)
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         """
         Override this with your desired test setup.
         """
         self.sub_stuff['execution_failure'] = None
         self.sub_stuff['uid_check'] = None
         self.sub_stuff['whoami_check'] = None
         self.sub_stuff['subargs'] = None
-        raise NotImplementedError("Override this methodin your test!")
+        raise NotImplementedError("Override this method in your test!")
 
     def initialize(self):
         """
@@ -94,7 +94,7 @@ def initialize(self):
         # Prepare a container
         config.none_if_empty(self.config)
         self.sub_stuff['dc'] = DockerContainers(self)
-        self._init_test_depenent()
+        self._init_test_dependent()
         self._init_container(self.sub_stuff['subargs'],
                              self.config['exec_cmd'])
 
@@ -161,7 +161,7 @@ class default(run_user_base):
     Doesn't use "-u" and expects the default user to be root::0
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         self.sub_stuff['execution_failure'] = False
         self.sub_stuff['uid_check'] = "UIDCHECK: 0:"
         self.sub_stuff['whoami_check'] = "WHOAMICHECK: root"
@@ -174,7 +174,7 @@ class named_user(run_user_base):
     Finds any user but root existing on container and uses it by name
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         user = None
         for line in self.parent_subtest.stuff['passwd'].splitlines():
             line = line.strip()
@@ -200,7 +200,7 @@ class num_user(run_user_base):
     Finds any user but root existing on container and uses it by uid
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         user = None
         for line in self.parent_subtest.stuff['passwd'].splitlines():
             line = line.strip()
@@ -226,7 +226,7 @@ class bad_user(run_user_base):
     Generates user name which doesn't exist in containers passwd
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         users = []
         for line in self.parent_subtest.stuff['passwd'].splitlines():
             line = line.strip()
@@ -248,7 +248,7 @@ class bad_number(run_user_base):
     (it should start, print correct uid, but whoami should fail)
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         uid = False
         uids = []
         for line in self.parent_subtest.stuff['passwd'].splitlines():
@@ -280,7 +280,7 @@ class too_high_number(run_user_base):
     Uses incorrectly large uid number (2147483648)
     """
 
-    def _init_test_depenent(self):
+    def _init_test_dependent(self):
         self.sub_stuff['execution_failure'] = ("Uids and gids must be in "
                                                "range 0-2147483647")
         self.sub_stuff['subargs'] = ['--rm', '--interactive',