Merge pull request #599 from edsantiago/we_want_information

DockerCmd : always run with verbose

Author: edsantiago

subtests/docker_cli/attach/attach.py

@@ -45,8 +45,7 @@ def image_exist(self, image_name):
 
     def pull_image(self, image_name):
         dkrcmd = AsyncDockerCmd(self, 'pull', [image_name],
-                                self.config['docker_timeout'],
-                                verbose=True)
+                                self.config['docker_timeout'])
         self.loginfo("Executing background command: %s" % dkrcmd)
         dkrcmd.execute()
         while not dkrcmd.done:
@@ -91,8 +90,7 @@ def initialize(self):
         self.sub_stuff['file_desc'].append(run_in_pipe_r)
         self.sub_stuff['file_desc'].append(run_in_pipe_w)
         self.sub_stuff["run_in_pipe_w"] = run_in_pipe_w
-        dkrcmd = AsyncDockerCmd(self, 'run', self.sub_stuff['subargs'],
-                                verbose=True)
+        dkrcmd = AsyncDockerCmd(self, 'run', self.sub_stuff['subargs'])
 
         # Runs in background
         self.sub_stuff['cmdresult'] = dkrcmd.execute(run_in_pipe_r)
@@ -121,8 +119,7 @@ def run_once(self):
 
         self.sub_stuff['subargs_a'].append(self.sub_stuff["rand_name"])
 
-        dkrcmd = AsyncDockerCmd(self, 'attach', self.sub_stuff['subargs_a'],
-                                verbose=True)
+        dkrcmd = AsyncDockerCmd(self, 'attach', self.sub_stuff['subargs_a'])
         # Runs in background
         self.sub_stuff['cmd_attach'] = dkrcmd
         self.sub_stuff['cmdresult_attach'] = dkrcmd.execute(attach_in_pipe_r)
@@ -198,8 +195,7 @@ def initialize(self):
         self.sub_stuff['file_desc'].append(run_in_pipe_r)
         self.sub_stuff['file_desc'].append(run_in_pipe_w)
         self.sub_stuff["run_in_pipe_w"] = run_in_pipe_w
-        dkrcmd = AsyncDockerCmd(self, 'run', self.sub_stuff['subargs'],
-                                verbose=True)
+        dkrcmd = AsyncDockerCmd(self, 'run', self.sub_stuff['subargs'])
 
         # Runs in background
         self.sub_stuff['cmdresult'] = dkrcmd.execute(run_in_pipe_r)
@@ -224,8 +220,7 @@ def run_once(self):
 
         self.sub_stuff['subargs_a'].append(self.sub_stuff["rand_name"])
 
-        dkrcmd = AsyncDockerCmd(self, 'attach', self.sub_stuff['subargs_a'],
-                                verbose=True)
+        dkrcmd = AsyncDockerCmd(self, 'attach', self.sub_stuff['subargs_a'])
         # Runs in background
         self.sub_stuff['cmd_attach'] = dkrcmd
         self.sub_stuff['cmdresult_attach'] = dkrcmd.execute()

subtests/docker_cli/build/build.py

@@ -79,9 +79,8 @@ def cleanup(self):
             for cid in self.stuff['dc'].list_container_ids():
                 if cid in self.stuff['existing_containers']:
                     continue    # don't remove previously existing ones
-                self.logdebug("Remoivng container %s", cid)
-                dcmd = DockerCmd(self, 'rm', ['--force', '--volumes', cid],
-                                 verbose=False)
+                self.logdebug("Removing container %s", cid)
+                dcmd = DockerCmd(self, 'rm', ['--force', '--volumes', cid])
                 dcmd.execute()
             dimg = self.stuff['di']
             base_repo_fqin = DockerImage.full_name_from_defaults(self.config)
@@ -96,9 +95,8 @@ def cleanup(self):
                     # never ever remove base_repo_fqin under any circumstance
                     if thing == base_repo_fqin:
                         continue
-                self.logdebug("Remoivng image %s", img)
-                dcmd = DockerCmd(self, 'rmi', ['--force', thing],
-                                 verbose=False)
+                self.logdebug("Removing image %s", img)
+                dcmd = DockerCmd(self, 'rmi', ['--force', thing])
                 dcmd.execute()
 
 
@@ -368,7 +366,7 @@ def filedir_contents_postprocess(self, build_def, command, parameter):
         else:
             cmd = 'ls -la "%s"' % path
         subargs = ['--rm', '--attach', 'stdout', build_def.image_name, cmd]
-        dkrcmd = DockerCmd(self, 'run', subargs, verbose=False)
+        dkrcmd = DockerCmd(self, 'run', subargs)
         dkrcmd.quiet = True
         dkrcmd.execute()
         exists = dkrcmd.exit_status == 0
@@ -470,7 +468,7 @@ def make_builds(self, source):
             os.chdir(dockerfile_dir_path)
         subargs = docker_build_options + ["-t", image_name,
                                           dockerfile_dir_path]
-        dockercmd = DockerCmd(self, 'build', subargs, verbose=True)
+        dockercmd = DockerCmd(self, 'build', subargs)
         # Pass as keywords allows ignoring parameter order
         return [self.BuildDef(image_name=image_name,
                               dockercmd=dockercmd,
@@ -510,9 +508,8 @@ def cleanup(self):
             for cid in self.sub_stuff['dc'].list_container_ids():
                 if cid in self.sub_stuff['existing_containers']:
                     continue    # don't remove previously existing ones
-                self.logdebug("Remoivng container %s", cid)
-                dcmd = DockerCmd(self, 'rm', ['--force', '--volumes', cid],
-                                 verbose=False)
+                self.logdebug("Removing container %s", cid)
+                dcmd = DockerCmd(self, 'rm', ['--force', '--volumes', cid])
                 dcmd.execute()
             dimg = self.sub_stuff['di']
             base_repo_fqin = DockerImage.full_name_from_defaults(self.config)
@@ -527,9 +524,8 @@ def cleanup(self):
                     # never ever remove base_repo_fqin under any circumstance
                     if thing == base_repo_fqin:
                         continue
-                self.logdebug("Remoivng image %s", img)
-                dcmd = DockerCmd(self, 'rmi', ['--force', thing],
-                                 verbose=False)
+                self.logdebug("Removing image %s", img)
+                dcmd = DockerCmd(self, 'rmi', ['--force', thing])
                 dcmd.execute()
 
 

subtests/docker_cli/cp/cp.py

@@ -149,8 +149,7 @@ def container_files(self, fqin):
                    "--attach=stdout",
                    fqin,
                    "python -c '%s'" % code]
-        # Data transfered over stdout, don't log it!
-        nfdc = DockerCmd(self, "run", subargs, verbose=False)
+        nfdc = DockerCmd(self, "run", subargs)
         nfdc.quiet = True
         self.logdebug("Executing %s", nfdc.command)
         mustpass(nfdc.execute())
@@ -175,8 +174,7 @@ def run_once(self):
                     % (self.config['max_files'], total))
         self.loginfo("Testing copy of %d files from container" % total)
         self.sub_stuff['results'] = {}  # cont_path -> cmdresult
-        # Avoid excessive logging
-        nfdc = DockerCmd(self, 'cp', verbose=False)
+        nfdc = DockerCmd(self, 'cp')
         nfdc.quiet = True
         nfiles = 0
         for index, srcfile in enumerate(self.sub_stuff['lastfiles']):

subtests/docker_cli/create/create_remote_tag.py

@@ -44,7 +44,7 @@ def init_save_images(self):
             self.loginfo("Removing images...")
             subargs = ['--force']
             subargs += [img.full_name for img in existing_images]
-            mustpass(DockerCmd(self, 'rmi', subargs, verbose=True).execute())
+            mustpass(DockerCmd(self, 'rmi', subargs).execute())
             # Wait for images to actually go away
             _fn = lambda: self.long_id_in_images(long_id)
             gone = utils.wait_for(_fn, 60, step=1,

subtests/docker_cli/images_all/images_all.py

@@ -45,7 +45,7 @@ def _init_container(self, prefix, fin, subargs, cmd):
         self.sub_stuff['containers'].append(name)
         subargs.append(fin)
         subargs.append(cmd)
-        mustpass(DockerCmd(self, 'run', subargs, verbose=False).execute())
+        mustpass(DockerCmd(self, 'run', subargs).execute())
         return name
 
     def _create_image(self, parent, prefix, cmd):
@@ -57,11 +57,10 @@ def _create_image(self, parent, prefix, cmd):
         images = self.sub_stuff['di']
         cont_name = self._init_container("test", parent, [], cmd)
         img_name = images.get_unique_name(prefix)
-        dkrcmd = DockerCmd(self, "commit", [cont_name, img_name],
-                           verbose=False)
+        dkrcmd = DockerCmd(self, "commit", [cont_name, img_name])
         img_id = mustpass(dkrcmd.execute()).stdout.strip()
-        mustpass(DockerCmd(self, 'rm', ['--force', '--volumes', cont_name],
-                           verbose=False).execute())
+        mustpass(DockerCmd(self, 'rm',
+                           ['--force', '--volumes', cont_name]).execute())
         self.sub_stuff['images'].append(img_id)
         return [img_id, img_name]
 
@@ -135,8 +134,8 @@ def id_in(long_id, images):
                             % (image[1], err_str()))
             if image[3] and image[4] is not None:
                 history = mustpass(DockerCmd(self, 'history',
-                                             ['--no-trunc', '-q', image[0]],
-                                             verbose=False).execute()).stdout
+                                             ['--no-trunc', '-q',
+                                              image[0]]).execute()).stdout
                 for parent in image[4]:
                     self.failif(parent not in history, "Parent image '%s' of "
                                 "image '%s' was not found in `docker history`:"
@@ -185,23 +184,23 @@ def run_once(self):
         # Verify
         self.verify_images((test_a, test_a1, test_b, test_b1))
         # Untag test_a
-        mustpass(DockerCmd(self, 'rmi', [test_a[1]], verbose=False).execute())
+        mustpass(DockerCmd(self, 'rmi', [test_a[1]]).execute())
         test_a[3] = False   # exists, untagged
         # Verify
         self.verify_images((test_a, test_a1, test_b, test_b1))
         # Untag test_a.1
-        mustpass(DockerCmd(self, 'rmi', [test_a1[1]], verbose=False).execute())
+        mustpass(DockerCmd(self, 'rmi', [test_a1[1]]).execute())
         test_a1[2:4] = [False, False]   # doesn't exist, not tagged
         test_a[2:4] = [False, False]    # doesn't exist, not tagged
         # Verify
         self.verify_images((test_a, test_a1, test_b, test_b1))
         # Untag test_b.1
-        mustpass(DockerCmd(self, 'rmi', [test_b1[1]], verbose=False).execute())
+        mustpass(DockerCmd(self, 'rmi', [test_b1[1]]).execute())
         test_b1[2:4] = [False, False]  # doesn't exist, not tagged
         # Verify
         self.verify_images((test_a, test_a1, test_b, test_b1))
         # Remove the last image by id
-        mustpass(DockerCmd(self, 'rmi', [test_b[0]], verbose=False).execute())
+        mustpass(DockerCmd(self, 'rmi', [test_b[0]]).execute())
         test_b[2:4] = [False, False]    # doesn't exist, not tagged
         self.verify_images((test_a, test_a1, test_b, test_b1))
 

subtests/docker_cli/iptable/iptable.py

@@ -107,7 +107,7 @@ def initialize(self):
     def run_once(self):
         super(iptable_base, self).run_once()
         subargs = self.sub_stuff['subargs']
-        mustpass(DockerCmd(self, 'run -d', subargs, verbose=True).execute())
+        mustpass(DockerCmd(self, 'run -d', subargs).execute())
         self.sub_stuff['rules_during'] = self.read_iptable_rules(None)
 
     def postprocess(self):

subtests/docker_cli/kill/kill_utils.py

@@ -80,7 +80,7 @@ def _init_container_normal(self, name):
         subargs.append("bash")
         subargs.append("-c")
         subargs.append(self.config['exec_cmd'])
-        container = AsyncDockerCmd(self, 'run', subargs, verbose=False)
+        container = AsyncDockerCmd(self, 'run', subargs)
         self.sub_stuff['container_cmd'] = container
         container.execute()
 
@@ -103,7 +103,7 @@ def _init_container_attached(self, name):
         subargs.append("bash")
         subargs.append("-c")
         subargs.append(self.config['exec_cmd'])
-        container = DockerCmd(self, 'run', subargs, verbose=False)
+        container = DockerCmd(self, 'run', subargs)
         self.sub_stuff['container_cmd'] = container
         mustpass(container.execute())
 
@@ -113,7 +113,7 @@ def _init_container_attached(self, name):
         else:
             subargs = []
         subargs.append(name)
-        container = AsyncDockerCmd(self, 'attach', subargs, verbose=False)
+        container = AsyncDockerCmd(self, 'attach', subargs)
         self.sub_stuff['container_cmd'] = container  # overwrites finished cmd
         container.execute()
 
@@ -199,17 +199,15 @@ def _populate_kill_cmds(self, extra_subargs):
                     sig_long = False
                 else:
                     subargs = ["-s %s" % signal] + extra_subargs
-                kill_cmds.append(DockerCmd(self, 'kill', subargs,
-                                           verbose=False))
+                kill_cmds.append(DockerCmd(self, 'kill', subargs))
 
         # Kill -9 is the last one :-)
         signal = 9
         signals_sequence.append(signal)
         if self.config.get('kill_map_signals'):
             signal = SIGNAL_MAP.get(signal, signal)
         kill_cmds.append(DockerCmd(self, 'kill',
-                                   ["-s %s" % signal] + extra_subargs,
-                                   verbose=False))
+                                   ["-s %s" % signal] + extra_subargs))
 
         if sigproxy:
             self.logdebug("kill_command_example: Killing directly the "

subtests/docker_cli/kill_bad/kill_bad.py

@@ -42,7 +42,7 @@ def _init_container(self, name):
         subargs.append("bash")
         subargs.append("-c")
         subargs.append(self.config['exec_cmd'])
-        container = AsyncDockerCmd(self, 'run', subargs, verbose=False)
+        container = AsyncDockerCmd(self, 'run', subargs)
         self.sub_stuff['container_cmd'] = container
         container.execute()
 
@@ -70,15 +70,14 @@ def run_once(self):
         for signal in self.config['bad_signals'].split(','):
             mustfail(DockerCmd(self, 'kill',
                                ['-s', signal,
-                                self.sub_stuff['container_name']],
-                               verbose=False).execute(), 1)
+                                self.sub_stuff['container_name']]).execute(),
+                     1)
             self.failif(self.sub_stuff['container_cmd'].done, "Testing "
                         "container died after using signal %s." % signal)
         dkrcnt = DockerContainers(self)
         nonexisting_name = dkrcnt.get_unique_name()
         self.logdebug("Killing nonexisting containe.")
-        mustfail(DockerCmd(self, 'kill', [nonexisting_name],
-                           verbose=False).execute(), 1)
+        mustfail(DockerCmd(self, 'kill', [nonexisting_name]).execute(), 1)
 
     def postprocess(self):
         """

subtests/docker_cli/kill_stopped/kill_utils.py

@@ -80,7 +80,7 @@ def _init_container_normal(self, name):
         subargs.append("bash")
         subargs.append("-c")
         subargs.append(self.config['exec_cmd'])
-        container = AsyncDockerCmd(self, 'run', subargs, verbose=False)
+        container = AsyncDockerCmd(self, 'run', subargs)
         self.sub_stuff['container_cmd'] = container
         container.execute()
 
@@ -103,7 +103,7 @@ def _init_container_attached(self, name):
         subargs.append("bash")
         subargs.append("-c")
         subargs.append(self.config['exec_cmd'])
-        container = DockerCmd(self, 'run', subargs, verbose=False)
+        container = DockerCmd(self, 'run', subargs)
         self.sub_stuff['container_cmd'] = container
         mustpass(container.execute())
 
@@ -113,7 +113,7 @@ def _init_container_attached(self, name):
         else:
             subargs = []
         subargs.append(name)
-        container = AsyncDockerCmd(self, 'attach', subargs, verbose=False)
+        container = AsyncDockerCmd(self, 'attach', subargs)
         self.sub_stuff['container_cmd'] = container  # overwrites finished cmd
         container.execute()
 
@@ -199,17 +199,15 @@ def _populate_kill_cmds(self, extra_subargs):
                     sig_long = False
                 else:
                     subargs = ["-s %s" % signal] + extra_subargs
-                kill_cmds.append(DockerCmd(self, 'kill', subargs,
-                                           verbose=False))
+                kill_cmds.append(DockerCmd(self, 'kill', subargs))
 
         # Kill -9 is the last one :-)
         signal = 9
         signals_sequence.append(signal)
         if self.config.get('kill_map_signals'):
             signal = SIGNAL_MAP.get(signal, signal)
         kill_cmds.append(DockerCmd(self, 'kill',
-                                   ["-s %s" % signal] + extra_subargs,
-                                   verbose=False))
+                                   ["-s %s" % signal] + extra_subargs))
 
         if sigproxy:
             self.logdebug("kill_command_example: Killing directly the "

subtests/docker_cli/kill_stress/kill_stress.py

@@ -95,7 +95,7 @@ def _populate_kill_cmds(self, extra_subargs):
         if sigproxy:
             self.sub_stuff['kill_cmds'].append(False)
         else:
-            dcmd = DockerCmd(self, 'kill', extra_subargs, verbose=False)
+            dcmd = DockerCmd(self, 'kill', extra_subargs)
             self.sub_stuff['kill_cmds'].append(dcmd)
         self.sub_stuff['signals_set'] = signals_set