Merge pull request #448 from adobe-apiplatform/feature/test-rework

Test rework

Author: adorton-adobe

.appveyor/build.ps1

@@ -1,11 +1,23 @@
 if ($env:python.endswith("36-x64")) {
+    $ldapver="cp36-cp36m"
     $pycmd = "${env:python}\python.exe"
     & $pycmd -m venv venv
 } else {
+    $ldapver="cp27-cp27m"
     $venvcmd = "${env:python}\Scripts\virtualenv.exe"
     & $venvcmd venv
 }
 .\venv\Scripts\activate.ps1
+pip install external\okta-0.0.3.1-py2.py3-none-any.whl
+pip install external\pyldap-2.4.45-${ldapver}-win_amd64.whl
+pip install -e .
+pip install -e .[test]
+pip install -e .[setup]
+
+if ($env:python.endswith("36-x64")) {
+    pip uninstall -y enum34
+}
+
 make 2>&1
 dir dist
 mkdir release

.appveyor/test.ps1

@@ -0,0 +1,3 @@
+.\venv\Scripts\activate.ps1
+python setup.py test
+exit $LASTEXITCODE

.travis.yml

@@ -9,18 +9,20 @@ matrix:
     python:
     - 3.6
     install:
-    - ".travis/install-ubuntu.sh"
+    - .travis/install-ubuntu.sh
     script:
-    - ".travis/build-py36.sh"
-    - ".travis/release.sh"
+    - .travis/build-py36.sh
+    - .travis/release.sh
+    - python setup.py test
   - env: IMG="ubuntu1604"
     python:
     - 2.7
     install:
-    - ".travis/install-ubuntu.sh"
+    - .travis/install-ubuntu.sh
     script:
-    - ".travis/build-py27.sh"
-    - ".travis/release.sh"
+    - .travis/build-py27.sh
+    - .travis/release.sh
+    - python setup.py test
   - env: OS="centos:7" IMG="centos7" SH="docker exec -t ${IMG} bash -c"
     services:
     - docker
@@ -50,6 +52,8 @@ matrix:
     script:
     - $SH .travis/build-py27.sh
     - $SH .travis/release.sh
+    - $SH "python setup.py test"
+
 deploy:
   provider: releases
   api_key:

.travis/build-py27.sh

@@ -1,2 +1,7 @@
 #!/usr/bin/env bash
+pip install --upgrade pip setuptools
+pip install external/okta-0.0.3.1-py2.py3-none-any.whl
+pip install -e .
+pip install -e .[test]
+pip install -e .[setup]
 make

.travis/build-py36-centos.sh

@@ -3,7 +3,10 @@ virtualenv venv -p /usr/bin/python3.6
 source venv/bin/activate
 pip install external/okta-0.0.3.1-py2.py3-none-any.whl
 pip install -e .
+pip install -e .[test]
+pip install -e .[setup]
 pip uninstall -y enum34
 make
 pwd
 .travis/release.sh
+python setup.py test

.travis/build-py36.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 pip install external/okta-0.0.3.1-py2.py3-none-any.whl
 pip install -e .
+pip install -e .[test]
+pip install -e .[setup]
 pip uninstall -y enum34
 make

appveyor.yml

@@ -9,6 +9,9 @@ install:
 build_script:
 - ps: .appveyor\build.ps1
 
+test_script:
+- ps: .appveyor\test.ps1
+
 artifacts:
 - path: release/*.zip
   name: Zips

nose.cfg

@@ -1,6 +1,5 @@
 [aliases]
-test=nosetests
+test=pytest
 
-[nosetests]
-verbosity=3
-with-doctest=1
+[tool:pytest]
+addopts = --cov=user_sync

setup.cfg

@@ -18,14 +18,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import sys
-
 from setuptools import setup
 
 version_namespace = {}
 with open('user_sync/version.py') as f:
     exec(f.read(), version_namespace)
 
+test_deps = ['mock', 'pytest', 'pytest-cov']
+setup_deps = ['pytest-runner']
+
 setup(name='user-sync',
       version=version_namespace['__version__'],
       description='Application for synchronizing customer directories with the Adobe Enterprise Admin Console',
@@ -55,19 +56,18 @@
           'umapi-client>=2.11',
       ],
       extras_require={
-          ':sys_platform=="linux" or sys_platform=="linux2"':[
+          ':sys_platform=="linux" or sys_platform=="linux2"': [
               'secretstorage',
               'dbus-python'
           ],
-          ':sys_platform=="win32"':[
+          ':sys_platform=="win32"': [
               'pywin32-ctypes'
-          ]
+          ],
+          'test': test_deps,
+          'setup': setup_deps,
       },
-      setup_requires=['nose>=1.0'],
-      tests_require=[
-          'mock',
-          'nose>=1.0',
-      ],
+      setup_requires=setup_deps,
+      tests_require=test_deps,
       entry_points={
           'console_scripts': [
               'user_sync = user_sync.app:main'