Merge pull request #595 from edsantiago/run_cgroup_parent_err_msg

docker run --cgroup-parent: error message change

Author: edsantiago

config_defaults/subtests/docker_cli/run_cgroup_parent.ini

@@ -1,2 +1,6 @@
 [docker_cli/run_cgroup_parent]
 subsubtests = run_cgroup_parent_invalid_name,run_cgroup_parent_path,run_cgroup_parent_path_with_hyphens
+
+[docker_cli/run_cgroup_parent/run_cgroup_parent_invalid_name]
+#: Regex describing the error message we expect. Passed to re.match().
+expect_stderr = (docker: )?Error response from daemon: cgroup-parent for systemd cgroup should be a valid slice named as "xxx.slice"\.

subtests/docker_cli/run_cgroup_parent/run_cgroup_parent.py

@@ -40,7 +40,7 @@ def _setup(self, cg_parent):
         self.sub_stuff['rand2'] = utils.generate_random_string(8)
         self.sub_stuff['cgroup_parent'] = cg_parent.format(**self.sub_stuff)
 
-    def _expect(self, path=None, stderr=None):
+    def _expect(self, path=None, stderr=None, exit_status=0):
         """
         Set up test parameters: what to expect on completion.
         The format strings {rand1} and {rand2} will be replaced with the
@@ -49,6 +49,7 @@ def _expect(self, path=None, stderr=None):
         """
         self.sub_stuff['expected_path'] = path if path else ''
         self.sub_stuff['expected_stderr'] = stderr if stderr else ''
+        self.sub_stuff['expected_status'] = exit_status
 
     def run_once(self):
         """
@@ -72,7 +73,8 @@ def postprocess(self):
         super(run_cgroup_parent_base, self).postprocess()
 
         cmdresult = self.sub_stuff["cmdresult"]
-        OutputGood(cmdresult, ignore_error=True)
+        expected_status = self.sub_stuff["expected_status"]
+        OutputGood(cmdresult, ignore_error=(expected_status != 0))
 
         self.sub_stuff["cid"] = self._read_cid()
         path_exp = self.sub_stuff['expected_path'].format(**self.sub_stuff)
@@ -86,7 +88,13 @@ def postprocess(self):
         stderr = "\n".join([line
                             for line in cmdresult.stderr.strip().split("\n")
                             if not line.startswith('time="')])
-        self.failif_ne(stderr, stderr_exp, "stderr")
+        if stderr_exp:
+            re_stderr = re.compile(stderr_exp)
+            if not re.match(re_stderr, stderr):
+                raise DockerTestFail("expected '%s' not found in stderr ('%s')"
+                                     % (stderr_exp, stderr))
+        else:
+            self.failif_ne(stderr, stderr_exp, "unexpected stderr")
 
         # If we're expecting stdout, it must contain multiple lines each
         # of the form:
@@ -112,6 +120,9 @@ def postprocess(self):
         else:
             self.failif_ne(stdout, '', "unexpected output on stdout")
 
+        # Check exit code last: the stdout/stderr diagnostics are more helpful
+        self.failif_ne(cmdresult.exit_status, expected_status, "exit status")
+
     def _read_cid(self):
         """
         Read container ID from --cidfile file, so we can replace {cid}
@@ -161,9 +172,7 @@ class run_cgroup_parent_invalid_name(run_cgroup_parent_base):
     def initialize(self):
         super(run_cgroup_parent_invalid_name, self).initialize()
         self._setup("/{rand1}")
-        self._expect(stderr="Error response from daemon:"
-                     " Cannot start container {cid}: [8] System error:"
-                     " Invalid slice name /{rand1}")
+        self._expect(stderr=self.config['expect_stderr'], exit_status=125)
 
 
 class run_cgroup_parent_path(run_cgroup_parent_base):