Merge pull request #493 from cevich/docker_0.8.3

Docker 0.8.3

Author: cevich

conf.py

@@ -22,7 +22,7 @@
 #: are also reflected in documentation.
 #:
 #: The short X.Y version. This MUST be inside single ("'") quotes for parsing!!
-version = '0.8.2'
+version = '0.8.3'
 
 #: If extensions (or modules to document with autodoc) are in another directory,
 #: add these directories to sys.path here. If the directory is relative to the

config_defaults/defaults.ini

@@ -6,7 +6,7 @@
 # all settings and sections defined here (config_defaults/)
 
 ##### API Version number applying to all bundled tests
-config_version = 0.8.2
+config_version = 0.8.3
 
 #: Autotest version dependency for framework (or override for individual tests)
 autotest_version = 0.16.0-master-66-g9aaee

dockertest/version.py

@@ -31,7 +31,7 @@
 
 #: API Revision number, as an integer (range 0-255).  Not significant!
 #: for version comparisons. e.g. ``0.0.1 == 0.0.2 != 0.2.2``
-REVIS = 2
+REVIS = 3
 
 #: String format representation for MAJOR, MINOR, and REVIS
 FMTSTRING = "%d.%d.%d"

subtests/docker_cli/commit/commit.py

@@ -117,7 +117,9 @@ def cleanup(self):
         super(commit_base, self).cleanup()
         if self.config['remove_after_test']:
             dc = DockerContainers(self)
-            dc.clean_all(self.sub_stuff.get("container", []))
+            container = self.sub_stuff.get("container")
+            if container:
+                dc.clean_all([container])
             di = di = DockerImages(self)
             images = [img.full_name
                       for img in self.sub_stuff.get("image_list", [])]
@@ -140,3 +142,7 @@ def check_file_in_image(self):
                             " test initialization: %s != %s" %
                             (results.stdout.strip(),
                              self.sub_stuff["rand_data"]))
+
+
+class good(commit_base):
+    pass