Merge pull request #64 from jtpereyda/tox-optimize-sudo

Moved sudo from .travis.yml to inside tox.ini

Author: jtpereyda

.travis.yml

@@ -7,12 +7,7 @@ before_install: sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
 install: pip install tox
 
 script:
-- sudo tox
-
-before_deploy:
-- # If the script step uses sudo, the build artifacts will be owned by root.
-- # `chown` to the build user to support the deploy step.
-- sudo chown -R $USER:$USER *
+- tox
 
 deploy:
   provider: pypi

CHANGELOG.rst

@@ -2,6 +2,7 @@
 =====
 -  Fixed deployment from 0.0.2.
 -  Simplify CONTRIBUTING.rst for automated deployment.
+-  tox no longer runs entirely as sudo. The sudo has been moved into tox.ini and is more fine-grained.
 
 0.0.2
 =====
@@ -11,7 +12,7 @@ Development
 -----------
 -  Added build and PyPI badges.
 -  Added CONTRIBUTING.rst.
--  `check-manifest` now runs in automated build.
+-  check-manifest now runs in automated build.
 -  Travis now deploys to PyPI!
 
 0.0.1-dev5
@@ -25,7 +26,7 @@ Development
 ==========
 
 Fixes
-~~~~~
+-----
 -  Missing property setters in ``boofuzz.request.Request`` now implemented.
 -  Unit tests now pass on Windows.
 -  Fixed wheel build issue; boofuzz subpackages were missing.
@@ -34,13 +35,13 @@ Fixes
 ==========
 
 Fixes
-~~~~~
+-----
 -  Session constructor param ``session_filename`` is now optional.
 
 0.0.1-dev2
 ==========
 New features
-~~~~~~~~~~~~
+------------
 
 -  Now on PyPI! ``pip install boofuzz``
 -  API is now centralized so all classes are available at top level
@@ -53,14 +54,14 @@ New features
    ezOutlet EZ-11b.
 
 Backwards-incompatible
-~~~~~~~~~~~~~~~~~~~~~~
+----------------------
 
 -  Target now only takes an ``ITargetConnection``. This separates
    responsibilities and makes our code more flexible with different
    kinds of connections.
 
 Fixes
-~~~~~
+-----
 
 -  Bugs fixed:
 
@@ -75,7 +76,7 @@ Fixes
       properly.
 
 Back-end Improvements
-~~~~~~~~~~~~~~~~~~~~~
+---------------------
 
 This section took the most work. It has the least visible impact, but
 all of the refactors enable new features, fixes, and unit tests.
@@ -92,7 +93,7 @@ all of the refactors enable new features, fixes, and unit tests.
 -  Many Unit tests added.
 
 Other
-~~~~~
+-----
 
 -  Continuous integration with Travis is running!
 -  Doc organization improvements.

boofuzz/__init__.py

@@ -28,7 +28,7 @@
 from .sex import SullyRuntimeError, SizerNotUtilizedError, MustImplementException
 from .socket_connection import SocketConnection
 
-__version__ = '0.0.3.dev13'
+__version__ = '0.0.3.dev14'
 
 
 # REQUEST MANAGEMENT

tox.ini

@@ -1,13 +1,21 @@
 [tox]
-envlist = py27
+envlist = py27-{unix,windows}
 
 [testenv]
+whitelist_externals=sudo
+platform=
+    windows: win32
+    unix: linux2|darwin
 # This list is duplicated in setup.py extras_require. Make sure to change both!
 # This can stop once tox supports installing package extras.
-deps=pytest
+deps =
+    pytest
     pytest-bdd
     mock
     check-manifest
-commands=python -m pytest
+install_command =
+    python -m pip install {opts} {packages}
+commands =
+    windows: python -m pytest
+    unix: sudo {envpython} -m pytest
     python -m check_manifest
-install_command = python -m pip install {opts} {packages}