Merge pull request #1540 from jenshnielsen/fix_tests_in_shell

Run tests on installed code

Author: jenshnielsen

.travis.yml

@@ -67,10 +67,17 @@ script:
     - |
       cd docs
       make SPHINXOPTS="-W -v" htmlapi
-    - cd ..
+    # rerun the tests from within a python session to ensure that all fixtures
+    # are bundled correctly. To save time we only do this from python 3.6
+    - |
+      cd $HOME
+      if [[ $TRAVIS_PYTHON_VERSION  == "3.6" ]]; then
+        python -c "import sys; import qcodes; ec = qcodes.test(); sys.exit(ec)"
+      fi
 
 after_success:
     # upload code coverage
+    - cd $TRAVIS_BUILD_DIR
     - python-codacy-coverage -r qcodes/coverage.xml
     - codecov
     # upload the docs

qcodes/tests/dataset/test_guids.py

@@ -29,7 +29,7 @@ def protected_config():
         cfg.save_to_home()
 
 
-@settings(max_examples=50)
+@settings(max_examples=50, deadline=1000)
 @given(loc=hst.integers(0, 255), stat=hst.integers(0, 65535),
        smpl=hst.integers(0, 4294967295))
 def test_generate_guid(loc, stat, smpl):

qcodes/tests/test_config.py

@@ -2,6 +2,8 @@
 import jsonschema
 import os
 import json
+import unittest
+from pathlib import Path
 
 from functools import partial
 from contextlib import contextmanager
@@ -24,13 +26,13 @@
           "user": {"foo":  "1"},
           "c": 3, "bar": True, "z": 4}
 
-# expected config after updade by user
+# expected config after update by user
 UPDATED_CONFIG = {"a": 1, "b": 2, "h": 2,
                   "user": {"foo":  "bar"},
                   "c": 3, "bar": True, "z": 4}
 
 # the schema does not cover extra fields, so users can pass
-# wathever they want
+# whatever they want
 SCHEMA = {
         "$schema": "http://json-schema.org/draft-04/schema#",
         "type": "object",
@@ -60,7 +62,7 @@
             ]
         }
 
-# schema updaed by adding custom fileds by the
+# schema updated by adding custom fields by the
 UPDATED_SCHEMA = {
         "$schema": "http://json-schema.org/draft-04/schema#",
         "type": "object",
@@ -125,7 +127,7 @@
                    Config.schema_default_file_name: SCHEMA,
                    }
 
-# in this case the home config is messging up a type
+# in this case the home config is messing up a type
 BAD_CONFIG_MAP = {Config.default_file_name: {"z": 1, "a": 1, "b": 0},
                   ENV_KEY: {"z": 3, "h": 2, "user": {"foo":  1}},
                   Config.home_file_name: {"z": 3, "b": "2", "user": "foo"},
@@ -138,10 +140,10 @@
 
 
 @contextmanager
-def default_config(user_config: Optional[str]=None):
+def default_config(user_config: Optional[str] = None):
     """
     Context manager to temporarily establish default config settings.
-    This is achieved by overwritting the config paths of the user-,
+    This is achieved by overwriting the config paths of the user-,
     environment-, and current directory-config files with the path of the
     config file in the qcodes repository.
     Additionally the current config object `qcodes.config` gets copied and
@@ -230,6 +232,9 @@ def test_missing_config_file(self):
     @patch.object(Config, 'env_file_name', new_callable=PropertyMock)
     @patch.object(Config, 'load_config')
     @patch('os.path.isfile')
+    @unittest.skipIf(Path.cwd() == Path.home(),
+                     'This test requires that working dir is different from'
+                     'homedir.')
     def test_default_config_files(self, isfile, load_config, env, schema):
         # don't try to load custom schemas
         self.conf.schema_cwd_file_name = None
@@ -247,6 +252,9 @@ def test_default_config_files(self, isfile, load_config, env, schema):
     @patch.object(Config, 'env_file_name', new_callable=PropertyMock)
     @patch.object(Config, 'load_config')
     @patch('os.path.isfile')
+    @unittest.skipIf(Path.cwd() == Path.home(),
+                     'This test requires that working dir is different from'
+                     'homedir.')
     def test_bad_config_files(self, isfile, load_config, env, schema):
         # don't try to load custom schemas
         self.conf.schema_cwd_file_name = None
@@ -265,6 +273,9 @@ def test_bad_config_files(self, isfile, load_config, env, schema):
     @patch.object(Config, 'load_config')
     @patch('os.path.isfile')
     @patch("builtins.open", mock_open(read_data=USER_SCHEMA))
+    @unittest.skipIf(Path.cwd() == Path.home(),
+                     'This test requires that working dir is different from'
+                     'homedir.')
     def test_user_schema(self, isfile, load_config, env, schema):
         schema.return_value = copy.deepcopy(SCHEMA)
         env.return_value = ENV_KEY

setup.py

@@ -59,7 +59,8 @@ def readme():
       package_data={'qcodes': ['monitor/dist/*', 'monitor/dist/js/*',
                                'monitor/dist/css/*', 'config/*.json',
                                'instrument/sims/*.yaml',
-                               'tests/dataset/fixtures/2018-01-17/*/*']},
+                               'tests/dataset/fixtures/2018-01-17/*/*',
+                               'tests/drivers/auxiliary_files/*']},
       install_requires=[
           'numpy>=1.10',
           'pyvisa>=1.9.1',