From eba03cba70a00e1a36381616df893b07ad094503 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Thu, 9 Apr 2015 10:08:25 -0400
Subject: [PATCH 1/2] docker_cli/commit: Cleanup fix, move good sub-subtest

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 subtests/docker_cli/commit/commit.py |  8 +++++++-
 subtests/docker_cli/commit/good.py   | 15 ---------------
 2 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 subtests/docker_cli/commit/good.py

diff --git a/subtests/docker_cli/commit/commit.py b/subtests/docker_cli/commit/commit.py
index 3456962bc..1893f5f32 100644
--- a/subtests/docker_cli/commit/commit.py
+++ b/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
diff --git a/subtests/docker_cli/commit/good.py b/subtests/docker_cli/commit/good.py
deleted file mode 100644
index ed00a8c8d..000000000
--- a/subtests/docker_cli/commit/good.py
+++ /dev/null
@@ -1,15 +0,0 @@
-"""
-Test output of docker Pull command
-
-docker commit full_name
-
-1. Try to download repository from registry
-2. Check if image is in local repository.
-3. Remote image from local repository
-"""
-
-from commit import commit_base
-
-
-class good(commit_base):
-    config_section = 'docker_cli/commit/good'

From 5beb8cccc6997e15fb483638790a27a7c87f4bd3 Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Wed, 8 Apr 2015 17:20:56 -0400
Subject: [PATCH 2/2] Docker autotest 0.8.3 (No API Changes)

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 conf.py                      | 2 +-
 config_defaults/defaults.ini | 2 +-
 dockertest/version.py        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf.py b/conf.py
index 09bcdf7eb..ff2efccb1 100644
--- a/conf.py
+++ b/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
diff --git a/config_defaults/defaults.ini b/config_defaults/defaults.ini
index 37fc22858..ac6646e2b 100644
--- a/config_defaults/defaults.ini
+++ b/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
diff --git a/dockertest/version.py b/dockertest/version.py
index acda51d9e..2d9d66d55 100644
--- a/dockertest/version.py
+++ b/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"