run_exec: Remove invalid sub-subtests

Signed-off-by: Chris Evich <[email protected]>

Author: cevich

config_defaults/subtests/docker_cli/run_exec.ini

@@ -9,11 +9,11 @@ bash_cmd = /bin/sh
 exec_options_csv = --interactive
 #: csv command prefix (docker exec ... $exec_bash_cmd $cmd)
 exec_bash_cmd = /bin/sh,-c
-#: Specifies the executed command inside the container
+#: Specifies the executed command inside the running container
 cmd =
 #: expected exit status
 exit_status =
-subsubtests = exec_true, exec_false, exec_pid_count, detached_pid_count, smoke_pid_count
+subsubtests = exec_true, exec_false, exec_pid_count
 
 [docker_cli/run_exec/exec_true]
 cmd = /bin/true
@@ -27,24 +27,4 @@ exit_status = 1
 exec_bash_cmd = /bin/sh
 #: Expected count of pid in container when command using exec is started.
 pid_count = 3
-cmd =
-exit_status = 0
-
-[docker_cli/run_exec/detached_pid_count]
-exec_bash_cmd = /bin/sh
-#: Expected count of pid in container when command using exec is started.
-exec_options_csv = --interactive,--detach
-#: Expected count of pid in container when command using exec is started.
-pid_count = 3
-cmd =
-exit_status = 0
-
-
-[docker_cli/run_exec/smoke_pid_count]
-exec_bash_cmd = /bin/sh
-#: Expected count of pid in container when command using exec is started.
-exec_options_csv = --interactive,--detach
-#: Expected count of pid in container when command using exec is started.
-pid_count = 200
-cmd =
 exit_status = 0

subtests/docker_cli/run_exec/run_exec.py

@@ -217,62 +217,3 @@ def postprocess(self):
             self.failif(len(pids) != self.config.get("pid_count", 3),
                         "There should be exactly 3 pids in"
                         " container. Count of pid: %s" % len(pids))
-
-
-class detached_pid_count(exec_base):
-
-    def run_once(self):
-        super(detached_pid_count, self).run_once()    # Prints out basic info
-        dkrcmd = AsyncDockerCmdStdIn(self, 'exec', self.sub_stuff['exec_args'],
-                                     stdin_r=AsyncDockerCmdStdIn.PIPE)
-        self.sub_stuff['dkrcmd_exec'] = dkrcmd
-
-        time.sleep(5)
-        run_dkrcmd = self.sub_stuff['dkrcmd']
-        self.run_cmd(run_dkrcmd.stdin, "ls -l /proc\n")
-        self.wait_for_output(run_dkrcmd, "cmdline", 10)
-        self.run_cmd(run_dkrcmd.stdin, "exit\n")
-        dkrcmd.close()
-
-    def postprocess(self):
-        super(detached_pid_count, self).postprocess()  # Prints out basic info
-        if 'dkrcmd_exec' in self.sub_stuff and 'dkrcmd' in self.sub_stuff:
-            # Check count of pids
-            dkrcmd = self.sub_stuff['dkrcmd']
-            pids = re.findall("^dr.+ ([0-9]+).?$", dkrcmd.stdout, re.MULTILINE)
-            self.failif(len(pids) != self.config.get("pid_count", 3),
-                        "There should be exactly 3 pids in"
-                        " container. Count of pid: %s\n detail: %s" %
-                        (len(pids), self.sub_stuff['dkrcmd_exec']))
-
-
-class smoke_pid_count(exec_base):
-
-    def run_once(self):
-        super(smoke_pid_count, self).run_once()    # Prints out basic info
-        self.sub_stuff['dkrcmd_exec_list'] = []
-        for _ in xrange(self.config.get("pid_count", "200") - 2):
-            dkrcmd = AsyncDockerCmdStdIn(self, 'exec',
-                                         self.sub_stuff['exec_args'],
-                                         stdin_r=AsyncDockerCmdStdIn.PIPE)
-            self.sub_stuff['dkrcmd_exec_list'].append(dkrcmd)
-
-        time.sleep(5)
-        run_dkrcmd = self.sub_stuff['dkrcmd']
-        self.run_cmd(run_dkrcmd.stdin, "ls -l /proc\n")
-        self.wait_for_output(run_dkrcmd, "cmdline", 10)
-        self.run_cmd(run_dkrcmd.stdin, "exit\n")
-        for dkrcmd in self.sub_stuff['dkrcmd_exec_list']:
-            dkrcmd.close()
-
-    def postprocess(self):
-        super(smoke_pid_count, self).postprocess()  # Prints out basic info
-        if 'dkrcmd_exec_list' in self.sub_stuff and 'dkrcmd' in self.sub_stuff:
-            # Check count of pids
-            dkrcmd = self.sub_stuff['dkrcmd']
-
-            pids = re.findall("^dr.+ ([0-9]+).?$", dkrcmd.stdout, re.MULTILINE)
-            self.failif(len(pids) != self.config.get("pid_count", 200),
-                        "There should be exactly %s pids in"
-                        " container. Count of pid: %s\n" %
-                        (self.config.get("pid_count", 200), len(pids)))