Move tests folder

roam-qgis · Sep 18, 2017 · e0c07f3 · e0c07f3
1 parent 2d2b593
commit e0c07f3
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 10 deletions.
diff --git a/runtests.bat b/runtests.bat
@@ -3,6 +3,6 @@ pushd %~dp0
 
 call scripts/setenv.bat
 
-make test
+py.test src/roam.tests
 
 if defined DOUBLECLICKED pause
diff --git a/scripts/fabricate.py b/scripts/fabricate.py
@@ -300,7 +300,7 @@ def exists(path):
  def has_atimes(paths):
  """ Return whether a file created in each path supports atimes and mtimes.
  Return value is the same as used by file_has_atimes
- Note: for speed, this only tests files created at the top directory
+ Note: for speed, this only roam.tests files created at the top directory
  of each path. A safe assumption in most build environments.
  In the unusual case that any sub-directories are mounted
  on alternate file systems that don't support atimes, the build may

diff --git a/setup.py b/setup.py
@@ -135,7 +135,7 @@ def get_data_files():
  icon_resources=[(1, icon)])
 
 tests_target = dict(
- script=r'tests\__main__.py',
+ script=r'roam.tests\__main__.py',
  dest_base='Roam_tests',
  icon_resources=[(1, icon)])
 
@@ -182,7 +182,7 @@ def run(self):
  name='roam',
  version=roam.__version__,
  packages=find_packages('./src'),
- package_dir={'': 'src', 'tests': 'tests'},
+ package_dir={'': 'src', 'roam.tests': 'roam.tests'},
  url='',
  license='GPL',
  author='Digital Mapping Solutions',

diff --git a/tests/__init__.py → src/roam.tests/__init__.py b/tests/__init__.py → src/roam.tests/__init__.py
diff --git a/tests/__main__.py → src/roam.tests/__main__.py b/tests/__main__.py → src/roam.tests/__main__.py
@@ -7,7 +7,7 @@ def excepthook(errorhandler, exctype, value, traceback):
  errorhandler(exctype, value, traceback)
  logger.debug("Uncaught exception", exc_info=(exctype, value, traceback))
 
-LOG_FILENAME = 'roam-tests.log'
+LOG_FILENAME = 'roam-roam.tests.log'
 log_format = '%(levelname)s - %(asctime)s - %(module)s-%(funcName)s:%(lineno)d - %(message)s'
 console_format = '%(levelname)s %(module)s-%(funcName)s:%(lineno)d - %(message)s'
 formater = logging.Formatter(log_format)

diff --git a/tests/conftest.py → src/roam.tests/conftest.py b/tests/conftest.py → src/roam.tests/conftest.py
diff --git a/tests/data/glonass_gps_log.nmea → src/roam.tests/data/glonass_gps_log.nmea b/tests/data/glonass_gps_log.nmea → src/roam.tests/data/glonass_gps_log.nmea
diff --git a/tests/objects.py → src/roam.tests/objects.py b/tests/objects.py → src/roam.tests/objects.py
diff --git a/tests/roam.config → src/roam.tests/roam.config b/tests/roam.config → src/roam.tests/roam.config
diff --git a/tests/test_defaults.py → src/roam.tests/test_defaults.py b/tests/test_defaults.py → src/roam.tests/test_defaults.py
diff --git a/tests/test_featurecursor.py → src/roam.tests/test_featurecursor.py b/tests/test_featurecursor.py → src/roam.tests/test_featurecursor.py
@@ -1,12 +1,9 @@
 import pytest
-from mock import Mock
 
 from roam.infodock import FeatureCursor, NoFeature
 
-import tests.objects
-
-layer = tests.objects.newmemorylayer()
-layer = tests.objects.addfeaturestolayer(layer, 2)
+layer = objects.newmemorylayer()
+layer = objects.addfeaturestolayer(layer, 2)
 
 features = layer.getFeatures()
 featureone = features.next()

diff --git a/tests/test_form.py → src/roam.tests/test_form.py b/tests/test_form.py → src/roam.tests/test_form.py
diff --git a/tests/test_gps.py → src/roam.tests/test_gps.py b/tests/test_gps.py → src/roam.tests/test_gps.py
diff --git a/tests/test_project.py → src/roam.tests/test_project.py b/tests/test_project.py → src/roam.tests/test_project.py
diff --git a/tests/test_providers.py → src/roam.tests/test_providers.py b/tests/test_providers.py → src/roam.tests/test_providers.py
diff --git a/tests/test_updaterer.py → src/roam.tests/test_updaterer.py b/tests/test_updaterer.py → src/roam.tests/test_updaterer.py
diff --git a/tests/tests_editorwidgets/__init__.py → ...oam.tests/tests_editorwidgets/__init__.py b/tests/tests_editorwidgets/__init__.py → ...oam.tests/tests_editorwidgets/__init__.py
diff --git a/...ests_editorwidgets/test_checkboxwidget.py → ...ests_editorwidgets/test_checkboxwidget.py b/...ests_editorwidgets/test_checkboxwidget.py → ...ests_editorwidgets/test_checkboxwidget.py
diff --git a/tests/tests_editorwidgets/test_optionrow.py → ...sts/tests_editorwidgets/test_optionrow.py b/tests/tests_editorwidgets/test_optionrow.py → ...sts/tests_editorwidgets/test_optionrow.py