WIP: Use pytest for tests

.circleci/config.yml

@@ -8,22 +8,14 @@ workflows:
   version: 2
   test:
     jobs:
-      - test-singularity-3-python-3:
-          filters:
-            branches:
-              ignore: master
-      - test-singularity-3-python-2:
-          filters:
-            branches:
-              ignore: master
-      - test-singularity-2-python-2:
-          filters:
-            branches:
-              ignore: master
-      - test-singularity-2-python-3:
+      - test-singularity-3-python-3: &ignore_master
           filters:
             branches:
               ignore: master
+      - test-singularity-3-old-python-3: *ignore_master
+      - test-singularity-3-python-2: *ignore_master
+      - test-singularity-2-python-3: *ignore_master
+      - test-singularity-2-python-2: *ignore_master
 
 waitforapt: &waitforapt
   name: Remove cloud init lock
@@ -39,55 +31,57 @@ waitforapt: &waitforapt
 install_spython: &install_spython
   name: install spython
   command: |
-     $HOME/conda/bin/pip uninstall spython --yes || echo "Not installed"
-     $HOME/conda/bin/python setup.py install
+      pip uninstall spython --yes || echo "Not installed"
+      python --version
+      python setup.py install
 
 install_python_3: &install_python_3
-  name: install Python 3.5 dependencies
+  name: install Python 3 dependencies
   command: | 
-      ls $HOME
-      if [ ! -d "/home/circleci/conda" ]; then
+      echo 'export PATH="$HOME/conda/bin:$PATH"' >> "$BASH_ENV"
+      source "$BASH_ENV"
+      if [ ! -d "$HOME/conda" ]; then
           wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
           /bin/bash Miniconda3-latest-Linux-x86_64.sh -b -p $HOME/conda
-          export PATH=$HOME/conda/bin:$PATH
-          $HOME/conda/bin/python setup.py install
-       else
+      else
            echo "Miniconda 3 is already installed, continuing to build."
-       fi
+      fi
+      [ $(python -c'import sys;print(sys.version_info.major)') -eq 3 ]
 
 install_python_2: &install_python_2
-  name: install Python 3.5 dependencies
+  name: install Python 2 dependencies
   command: | 
-      ls $HOME
-      if [ ! -d "/home/circleci/conda" ]; then
+      echo 'export PATH="$HOME/conda/bin:$PATH"' >> "$BASH_ENV"
+      if [ ! -d "$HOME/conda" ]; then
           wget https://repo.anaconda.com/miniconda/Miniconda2-latest-Linux-x86_64.sh
           /bin/bash Miniconda2-latest-Linux-x86_64.sh -b -p $HOME/conda
-          export PATH=$HOME/conda/bin:$PATH
-          $HOME/conda/bin/python setup.py install
-       else
+      else
            echo "Miniconda 2 is already installed, continuing to build."
-       fi
+      fi
+      [ $(python -c'import sys;print(sys.version_info.major)') -eq 2 ]
+
+install_dependencies: &install_dependencies
+  name: install CI dependencies
+  command: |
+      pip install --upgrade pylint pytest
 
 run_linter: &run_linter
   name: run linter
   command: |
-     $HOME/conda/bin/pip install --upgrade pylint
-     cd ~/repo
-     $HOME/conda/bin/pylint spython
+      cd ~/repo
+      pylint spython
 
 test_spython: &test_spython
   name: Test Singularity Python (Singularity Version 2 and 3)
   command: |
-        cd ~/repo/spython
-        $HOME/conda/bin/python -m unittest tests.test_client
-        $HOME/conda/bin/python -m unittest tests.test_utils
-        $HOME/conda/bin/python -m unittest tests.test_instances
+      cd ~/repo/spython
+      pytest -k 'not test_oci'
 
 test_spython_3: &test_spython_3
   name: Test Singularity Python (Singularity Version 3 Only)
   command: |
-        cd ~/repo/spython
-        $HOME/conda/bin/python -m unittest tests.test_oci
+      cd ~/repo/spython
+      pytest -k 'test_oci'
 
 
 jobs:
@@ -98,19 +92,43 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - v1-dependencies
+          - v1-dependencies-py3
       - run: *install_python_3
       - run: *waitforapt
       - singularity/install-go:
           go-version: 1.11.5
       - singularity/debian-install-3:
-          singularity-version: 3.1.0
+          singularity-version: 3.2.1
       - run: *install_spython
+      - run: *install_dependencies
+      - save_cache:
+          paths:
+            - ~/conda
+          key: v1-dependencies-py3
       - run: *run_linter
+      - run: *test_spython
+      - run: *test_spython_3
+
+  test-singularity-3-old-python-3:
+    machine: true
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+          - v1-dependencies-py3
+      - run: *install_python_3
+      - run: *waitforapt
+      - singularity/install-go:
+          go-version: 1.11.5
+      - singularity/debian-install-3:
+          singularity-version: 3.1.0
+      - run: *install_spython
+      - run: *install_dependencies
       - save_cache:
           paths:
-            - /home/circleci/conda
-          key: v1-dependencies        
+            - ~/conda
+          key: v1-dependencies-py3
       - run: *test_spython
       - run: *test_spython_3
 
@@ -121,19 +139,19 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - v1-dependencies
+          - v1-dependencies-py2
       - run: *install_python_2
       - run: *waitforapt
       - singularity/install-go:
           go-version: 1.11.5
       - singularity/debian-install-3:
-          singularity-version: 3.1.0
+          singularity-version: 3.2.1
       - run: *install_spython
-      - run: *run_linter
+      - run: *install_dependencies
       - save_cache:
           paths:
-            - /home/circleci/conda
-          key: v1-dependencies        
+            - ~/conda
+          key: v1-dependencies-py2
       - run: *test_spython
       - run: *test_spython_3
 
@@ -144,16 +162,17 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - v1-dependencies
+          - v1-dependencies-py3
       - run: *install_python_3
       - run: *waitforapt
       - singularity/debian-install-2:
           singularity-version: 2.6.1
       - run: *install_spython
+      - run: *install_dependencies
       - save_cache:
           paths:
-            - /home/circleci/conda
-          key: v1-dependencies        
+            - ~/conda
+          key: v1-dependencies-py3
       - run: *test_spython
 
   test-singularity-2-python-2:
@@ -163,14 +182,15 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-          - v1-dependencies
+          - v1-dependencies-py2
       - run: *install_python_2
       - run: *waitforapt
       - singularity/debian-install-2:
           singularity-version: 2.6.1
       - run: *install_spython
+      - run: *install_dependencies
       - save_cache:
           paths:
-            - /home/circleci/conda
-          key: v1-dependencies        
+            - ~/conda
+          key: v1-dependencies-py2
       - run: *test_spython

requirements.txt

@@ -1 +1,2 @@
 requests
+semver

spython/image/__init__.py

@@ -50,7 +50,7 @@ def __init__(self, image=None):
             image: the image uri to parse (required)
 
         '''
-        super().__init__()
+        super(Image, self).__init__()
         self.parse_image_name(image)
 
 

spython/instance/__init__.py

@@ -22,7 +22,7 @@ def __init__(self, image, start=True, name=None, **kwargs):
             name: a name for the instance (will generate RobotName 
                     if not provided)
         '''
-        super().__init__()
+        super(Instance, self).__init__()
         self.parse_image_name(image)
         self.generate_name(name)
 

spython/main/base/__init__.py

@@ -9,7 +9,8 @@
 from spython.logger import bot
 from spython.utils import ( 
     check_install,
-    get_singularity_version
+    get_singularity_version,
+    get_singularity_version_info
 )
 
 import json
@@ -43,10 +44,15 @@ def __init__(self):
         self._init_level()
 
     def version(self):
-        '''a wrapped to get_singularity_version, takes no arguments.
+        '''Shortcut to get_singularity_version, takes no arguments.
         '''
         return get_singularity_version()
 
+    def version_info(self):
+        '''Shortcut to get_singularity_version_info, takes no arguments.
+        '''
+        return get_singularity_version_info()
+
     def _check_install(self):
         '''ensure that singularity is installed, and exit if not.
         '''

spython/oci/__init__.py

@@ -30,7 +30,7 @@ def __init__(self,
             sudo: if init is called with or without sudo, keep a record and use
                   for following commands unless sudo is provided to function.
         '''
-        super().__init__()
+        super(OciImage, self).__init__()
 
         # Will typically be None, unless used outside of Client
         self.container_id = container_id

spython/tests/test_oci.py

@@ -13,6 +13,7 @@
 import tempfile
 import shutil
 import os
+from semver import VersionInfo
 
 print("############################################################## test_oci")
 
@@ -37,7 +38,7 @@ def _build_sandbox(self):
         self.assertTrue(os.path.exists(image))
 
         print('Copying OCI config.json to sandbox...')
-        shutil.copyfile(self.config, '%s/config.json' %image)
+        shutil.copyfile(self.config, '%s/config.json' % image)
         return image
 
     def test_oci_image(self):
@@ -61,34 +62,51 @@ def test_oci(self):
         print(result)
         self.assertEqual(result['status'], 'created')
 
-        print('...Case 3. Execute command to running bundle.')
+        print('...Case 3. Execute command to non running bundle.')
         result = self.cli.oci.execute(container_id=self.name, 
                                       sudo=True, 
                                       command=['ls','/'])
 
         print(result)
-        self.assertTrue('bin' in result)
-
-        print('...Case 4. Check status of existing bundle.')
-        state = self.cli.oci.state(self.name, sudo=True)
-        self.assertEqual(state['status'], 'created')
+        if self.cli.version_info() >= VersionInfo(3, 2, 1):
+            self.assertTrue(result['return_code'] == 255)
+        else:
+            self.assertTrue('bin' in result)
 
-        print('...Case 5. Start container return value 0.')
+        print('...Case 4. Start container return value 0.')
         state = self.cli.oci.start(self.name, sudo=True)
         self.assertEqual(state, 0)
 
-        print('...Case 6. Testing that state is now running.')
+        print('...Case 5. Execute command to running bundle.')
+        result = self.cli.oci.execute(container_id=self.name, 
+                                      sudo=True, 
+                                      command=['ls','/'])
+
+        print(result)
+        self.assertTrue('bin' in result)
+
+        print('...Case 6. Check status of existing bundle.')
         state = self.cli.oci.state(self.name, sudo=True)
         self.assertEqual(state['status'], 'running')
 
         print('...Case 7. Pause running container return value 0.')
         state = self.cli.oci.pause(self.name, sudo=True)
         self.assertEqual(state, 0)
 
+        # State was still reported as running
+        if self.cli.version_info() >= VersionInfo(3, 2, 1):
+            print('...check status of paused bundle.')
+            state = self.cli.oci.state(self.name, sudo=True)
+            self.assertEqual(state['status'], 'paused')
+
         print('...Case 8. Resume paused container return value 0.')
         state = self.cli.oci.resume(self.name, sudo=True)
         self.assertEqual(state, 0)
 
+        print('...check status of resumed bundle.')
+        state = self.cli.oci.state(self.name, sudo=True)
+        self.assertEqual(state['status'], 'running')
+
         print('...Case 9. Kill container.')
         state = self.cli.oci.kill(self.name, sudo=True)
         self.assertEqual(state, 0)

spython/tests/test_utils.py

@@ -10,6 +10,7 @@
 import tempfile
 import shutil
 import os
+from semver import VersionInfo
 
 print("############################################################ test_utils")
 
@@ -85,6 +86,26 @@ def test_check_get_singularity_version(self):
             os.environ['SPYTHON_SINGULARITY_VERSION'] = oldValue
         self.assertTrue(version == "3.0")
 
+    def test_check_get_singularity_version_info(self):
+        '''Check that the version_info is correct'''
+        from spython.utils import get_singularity_version_info
+        oldValue = os.environ.get('SPYTHON_SINGULARITY_VERSION')
+        os.environ['SPYTHON_SINGULARITY_VERSION'] = "2.3.1"
+        version = get_singularity_version_info()
+        assert version == VersionInfo(2, 3, 1)
+        assert version > VersionInfo(2, 3, 0)
+        assert version < VersionInfo(3, 0, 0)
+        os.environ['SPYTHON_SINGULARITY_VERSION'] = "singularity version 3.2.1-1"
+        version = get_singularity_version_info()
+        assert version == VersionInfo(3, 2, 1, "1")
+        assert version > VersionInfo(2, 0, 0)
+        assert version < VersionInfo(3, 3, 0)
+        # Restore for other tests
+        if oldValue is None:
+            del os.environ['SPYTHON_SINGULARITY_VERSION']
+        else:
+            os.environ['SPYTHON_SINGULARITY_VERSION'] = oldValue
+
 
     def test_get_installdir(self):
         '''get install directory should return the base of where singularity