Merge branch 'tests-update' of https://github.com/bjones1/RunestoneServer into bjones1-tests-update

Author: runestonetest

.travis.yml

@@ -34,7 +34,7 @@ script:
 - cd tests
 # Now actually run the tests
 - cp .coveragerc ../../../
-- python run_tests.py
+- pytest
 - cd ../../..
 - coveralls
 notifications:

scripts/dtest

@@ -2,7 +2,7 @@
 # bash -c "clear && docker exec -it runestoneserver_runestone_1 bash -c 'cd applications/runestone/tests; python run_tests.py'"
 
 echo "$@"
-basecomm="cd applications/runestone/tests; cp .coveragerc ../../../ ; python run_tests.py"
+basecomm="cd applications/runestone/tests; cp .coveragerc ../../../; pytest"
 dcomm="$basecomm $@"
 docker exec -it runestoneserver_runestone_1 bash -c "$dcomm"
 

tests/README.rst

@@ -7,25 +7,26 @@ If you just want to run the tests:
 
 - There are some extra modules needed, so install them
 
-.. code-block::
+  .. code-block::
 
-    cd runestone
-    pip install -r requirements-test.txt
+      cd runestone
+      pip install -r requirements-test.txt
 
 
-- Next, connect to this directory (`runestone/tests`)
+- Next, switch to the test directory (``runestone/tests``)
 - **Make sure that you don't have a runestone server running.** If you do, that server will handle the web page requests that occur during the tests instead of letting the test server respond to them, and it will be accessing the wrong database.
+- Run the tests. From the shell:
 
-.. code-block::
+  .. code-block::
 
-    python run_tests.py
+      pytest
 
 
-Or if you have a docker container set up:
+  Or if you have a docker container set up:
 
-.. code-block::
+  .. code-block::
 
-    docker exec -it runestoneserver_runestone_1 bash -c 'cd applications/runestone/tests; python run_tests.py'
+      docker exec -it runestoneserver_runestone_1 bash -c 'cd applications/runestone/tests; pytest'
 
 But we really hope you will write some tests, so lets take a look at a sample of a test that simulates a user submitting a response to a poll.  We'll then check to see that their answer made it into the database, and then make sure that the api call to retrieve poll results works as expected
 
@@ -76,9 +77,9 @@ But we really hope you will write some tests, so lets take a look at a sample of
         assert res[-1] == "1"
 
 
-The test above can be run as part of the entire suite of tests by running ``scripts/dtest -k test_poll`` from the Runestone main directory.  This assumes that you have a Docker environment set up for your developent work. If you are not using docker then from the tests folder run ``python run_tests.py -k test_poll`` The ``-k`` option matches any part of the test names, so you don't have to give it the full test name.  ``-k poll`` would run any test that has poll in its name.
+The test above can be run as part of the entire suite of tests by running ``scripts/dtest -k test_poll`` from the Runestone main directory.  This assumes that you have a Docker environment set up for your developent work. If you are not using docker then from the tests folder run ``pytest -k test_poll`` The ``-k`` option matches any part of the test names, so you don't have to give it the full test name.  ``-k poll`` would run any test that has poll in its name.
 
-The ``run_tests.py`` script ensures that the database is initialized, a test book/course is created (called test_course_1) and all of the testing framework is in place.  The pytest framework uses "fixtures" to help with all the gory details of setting up a test environment and creating various pieces of that environment. When you define a test_function that has one of these as a parameter name, when the test runner executes the function, the parameter will be bound to the fixture object.  The fixtures include:
+The pytest framework uses "fixtures" to help with all the gory details of setting up a test environment and creating various pieces of that environment. When you define a test_function that has one of these as a parameter name, when the test runner executes the function, the parameter will be bound to the fixture object.  The fixtures include:
 
 * test_client - A client for interacting with the web2py Server
 
@@ -250,4 +251,4 @@ From the scripts folder, run the command:
     locust -f locustfile.py
 
 
-Then in your browser go to `http://127.0.0.1:8089` You an set up how many users you want and how fast they will come online.  The webpage will update every couple of seconds to show you statistics on load times for various kinds of pages.
+Then in your browser go to `http://127.0.0.1:8089` You an set up how many users you want and how fast they will come online.  The webpage will update every couple of seconds to show you statistics on load times for various kinds of pages.

tests/ci_utils.py

@@ -10,7 +10,7 @@
 # Standard library
 # ----------------
 from __future__ import print_function
-from subprocess import check_call
+from subprocess import run
 import sys
 import os
 import os.path
@@ -24,19 +24,22 @@
 
 # Copied from https://docs.python.org/3.5/library/platform.html#cross-platform.
 is_64bits = sys.maxsize > 2**32
-#
+
+
 # Support code
 # ============
 # xqt
 # ---
 # Pronounced "execute": provides a simple way to execute a system command.
 def xqt(
-  # Commands to run. For example, ``'foo -param firstArg secondArg', 'bar |
-  # grep alpha'``.
-  *cmds,
-  # Optional keyword arguments to pass on to `subprocess.check_call <https://docs.python.org/3/library/subprocess.html#subprocess.check_call>`_.
-  **kwargs):
+    # Commands to run. For example, ``'foo -param firstArg secondArg', 'bar |
+    # grep alpha'``.
+    *cmds,
+    # Optional keyword arguments to pass on to `subprocess.check_call <https://docs.python.org/3/library/subprocess.html#subprocess.check_call>`_.
+    **kwargs
+):
 
+    ret = []
     # Although https://docs.python.org/3/library/subprocess.html#subprocess.Popen
     # states, "The only time you need to specify ``shell=True`` on Windows is
     # when the command you wish to execute is built into the shell (e.g.
@@ -55,15 +58,21 @@ def xqt(
         # works. See https://docs.python.org/3/library/subprocess.html#subprocess.Popen.
         executable = ('/bin/bash' if is_linux or is_darwin
                       else None)
-        check_call(_, shell=True, executable=executable, **kwargs)
-#
+        ret.append(run(_, shell=True, capture_output=True,
+                       executable=executable, **kwargs))
+
+    # Return a list only if there were multiple commands to execute.
+    return ret[0] if len(ret) == 1 else ret
+
+
 # pushd
 # -----
 # A context manager for pushd.
 class pushd:
     def __init__(self,
-      # The path to change to upon entering the context manager.
-      path):
+        # The path to change to upon entering the context manager.
+        path
+    ):
 
         self.path = path
 
@@ -76,7 +85,8 @@ def __exit__(self, type_, value, traceback):
         flush_print('popd - returning to {}.'.format(self.cwd))
         os.chdir(self.cwd)
         return False
-#
+
+
 # Common tools
 # ============
 #
@@ -85,13 +95,15 @@ def __exit__(self, type_, value, traceback):
 def chdir(path):
     flush_print('cd ' + path)
     os.chdir(path)
-#
+
+
 # mkdir
 # -----
 def mkdir(path):
     flush_print('mkdir ' + path)
     os.mkdir(path)
-#
+
+
 # flush_print
 # -----------
 # Anything sent to ``print`` won't be printed until Python flushes its buffers,
@@ -102,14 +114,16 @@ def flush_print(*args, **kwargs):
     # Flush both buffers, just in case there's something in ``stdout``.
     sys.stdout.flush()
     sys.stderr.flush()
-#
+
+
 # isfile
 # ------
 def isfile(f):
     _ = os.path.isfile(f)
     flush_print('File {} {}.'.format(f, 'exists' if _ else 'does not exist'))
     return _
-#
+
+
 # isfile
 # ------
 def isdir(f):