Merge lp:~raharper/curtin/trunk.fix-trusty-unittest into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

unittest,tox.ini: catch and fix issue with trusty-level mock of open

unittest:
  - Mock out open calls via builtin
  - Handle module name difference between python2.7 and 3.0 via try-except
  - Split wipe_zero and wipe_random into separate tests

tox.ini:
  - add a 'trusty-py3' and 'trusty-py2' tox environment with more
    specific versions as to what is on trusty.

unittest,tox.ini: catch and fix issue with trusty-level mock of open

unittest:
  - Mock out open calls via builtin
  - Handle module name difference between python2.7 and 3.0 via try-except
  - Split wipe_zero and wipe_random into separate tests

tox.ini:
  - add a 'trusty-py3' and 'trusty-py2' tox environment with more
    specific versions as to what is on trusty.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:427
https://jenkins.ubuntu.com/server/job/curtin-ci/262/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=amd64/262
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=ppc64el/262
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=s390x/262

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/262/rebuild

review: Approve (continuous-integration)

[lp:~raharper/curtin/trunk.fix-trusty-unittest]

428. By Ryan Harper on 2016-09-16

unittest,tox.ini: use a mocked_open context manager, add missing tox env

429. By Ryan Harper on 2016-09-16

don't forget to add the helper

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:429
https://jenkins.ubuntu.com/server/job/curtin-ci/264/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=amd64/264
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=ppc64el/264
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=s390x/264

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/264/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

Passes vmtest on diglett (though there were Yakkety failures due to cloud-init bug).

[Ryan Harper (raharper)]

Re-ran after updating cloud-images, all pass now.

=== added file 'tests/unittests/helpers.py'
--- tests/unittests/helpers.py	1970-01-01 00:00:00 +0000
+++ tests/unittests/helpers.py	2016-09-16 18:55:36 +0000
@@ -0,0 +1,41 @@
+#   Copyright (C) 2016 Canonical Ltd.
+#
+#   Author: Scott Moser <[e-mail]>
+#
+#   Curtin is free software: you can redistribute it and/or modify it under
+#   the terms of the GNU Affero General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   Curtin is distributed in the hope that it will be useful, but WITHOUT ANY
+#   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#   FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
+#   more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with Curtin.  If not, see <http://www.gnu.org/licenses/>.
+import mock
+
+
+class mocked_open(object):
+    # older versions of mock can't really mock the builtin 'open' easily.
+    def __init__(self):
+        self.mocked = None
+
+    def __enter__(self):
+        if self.mocked:
+            return self.mocked.start()
+
+        py2_p = '__builtin__.open'
+        py3_p = 'builtins.open'
+        try:
+            self.mocked = mock.patch(py2_p, new_callable=mock.mock_open())
+            return self.mocked.start()
+        except ImportError:
+            self.mocked = mock.patch(py3_p, new_callable=mock.mock_open())
+            return self.mocked.start()
+
+    def __exit__(self, etype, value, trace):
+        if self.mocked:
+            self.mocked.stop()
+        self.mocked = None
 
=== modified file 'tests/unittests/test_block.py'
--- tests/unittests/test_block.py	2016-08-30 19:21:06 +0000
+++ tests/unittests/test_block.py	2016-09-16 18:55:36 +0000
@@ -7,6 +7,7 @@
 
 from collections import OrderedDict
 
+from .helpers import mocked_open
 from curtin import util
 from curtin import block
 
@@ -271,16 +272,21 @@
         block.wipe_volume(self.dev, mode='superblock-recursive')
         mock_quick_zero.assert_called_with(self.dev, partitions=True)
 
-    @mock.patch('curtin.block.open')
-    @mock.patch('curtin.block.wipe_file')
-    def test_wipe_zero_random(self, mock_wipe_file, mock_open):
-        block.wipe_volume(self.dev, mode='zero')
-        mock_wipe_file.assert_called_with(self.dev)
-        mock_open.return_value = mock.MagicMock()
-        block.wipe_volume(self.dev, mode='random')
-        mock_open.assert_called_with('/dev/urandom', 'rb')
-        mock_wipe_file.assert_called_with(
-            self.dev, reader=mock_open.return_value.__enter__().read)
+    @mock.patch('curtin.block.wipe_file')
+    def test_wipe_zero(self, mock_wipe_file):
+        with mocked_open() as mock_open:
+            block.wipe_volume(self.dev, mode='zero')
+            mock_wipe_file.assert_called_with(self.dev)
+            mock_open.return_value = mock.MagicMock()
+
+    @mock.patch('curtin.block.wipe_file')
+    def test_wipe_random(self, mock_wipe_file):
+        with mocked_open() as mock_open:
+            mock_open.return_value = mock.MagicMock()
+            block.wipe_volume(self.dev, mode='random')
+            mock_open.assert_called_with('/dev/urandom', 'rb')
+            mock_wipe_file.assert_called_with(
+                self.dev, reader=mock_open.return_value.__enter__().read)
 
     def test_bad_input(self):
         with self.assertRaises(ValueError):
 
=== modified file 'tox.ini'
--- tox.ini	2016-08-18 16:02:27 +0000
+++ tox.ini	2016-09-16 18:55:36 +0000
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py27, py3, py3-flake8, py3-pylint, py27-pylint, trusty-check
+envlist = py27, py3, py3-flake8, py3-pylint, py27-pylint, trusty-check, trusty-py27, trusty-py3
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
@@ -61,18 +61,37 @@
 commands =
     sphinx-build -b html -d doc/_build/doctrees doc/ doc/_build/html
 
-[testenv:trusty-check]
+[testenv:trusty]
 # this environment provides roughly a trusty build environment where
 # where 'make check' is run during package build.  This protects against
 # package build errors on trusty where pep8 and pyflakes there have subtly
 # different behavior.  Note, we do only run pyflakes3, though.
-basepython = python3
 deps = pyflakes==0.8.1
    pep8==1.4.6
+   mock==1.0.1
+   nose==1.3.1
+   pyyaml==3.10
+   oauthlib==0.6.1
+
+[testenv:trusty-check]
+deps = {[testenv:trusty]deps}
+basepython = python3
 commands =
    {toxinidir}/tools/run-pyflakes3 {posargs}
    {toxinidir}/tools/run-pep8 {posargs}
 
+[testenv:trusty-py27]
+deps = {[testenv:trusty]deps}
+basepython = python2.7
+commands = {envpython} {toxinidir}/tools/noproxy nosetests \
+    {posargs:tests/unittests}
+
+[testenv:trusty-py3]
+deps = {[testenv:trusty]deps}
+basepython = python3
+commands = {envpython} {toxinidir}/tools/noproxy nosetests \
+    {posargs:tests/unittests}
+
 [flake8]
 builtins = _
 exclude = .venv,.bzr,.tox,dist,doc,*lib/python*,*egg,build