Merge pull request #526 from edx/will/fix-makefile-test-cmd

Add phony target to Makefile for test and install

Makefile

 all: install test
 
+.PHONY: install test
+
 install-system:
 	sudo apt-get update -y -qq
 	sudo xargs -a apt-packages.txt apt-get install -y -qq --fix-missing
 
+
 install-node:
 	sudo add-apt-repository -y ppa:chris-lea/node.js
 	sudo apt-get update -y -qq

requirements/test.txt

-# Grab everything in base requirements
 -r base.txt
+-r test-acceptance.txt
 
 ddt==0.8.0
 django-nose==1.2

settings/test.py

@@ -14,6 +14,7 @@ TEST_APPS = (
 
 # Configure nose
 NOSE_ARGS = [
+    "-a '!acceptance'",
     '--with-coverage',
     '--cover-package=' + ",".join(TEST_APPS),
     '--cover-branches',

test/selenium/README.rst → test/acceptance/README.rst

@@ -22,6 +22,6 @@ To use the tests:
 
 .. code:: bash
 
-    cd edx-ora2/test/selenium
+    cd edx-ora2/test/acceptance
     export BASE_URL=https://{USER}:{PASSWORD}@example.com
     python tests.py

test/selenium/pages.py → test/acceptance/pages.py

@@ -6,7 +6,6 @@ from bok_choy.promise import EmptyPromise
 
 import os
 BASE_URL = os.environ.get('BASE_URL')
-assert BASE_URL is not None, 'No base URL specified - please set the `BASE_URL` environment variable'
 
 
 class PageConfigurationError(Exception):

test/selenium/tests.py → test/acceptance/tests.py

@@ -5,6 +5,7 @@ import os
 import unittest
 import time
 from functools import wraps
+from nose.plugins.attrib import attr
 from bok_choy.web_app_test import WebAppTest
 from bok_choy.promise import BrokenPromise
 from auto_auth import AutoAuthPage
@@ -86,6 +87,7 @@ class SelfAssessmentTest(OpenAssessmentTest):
         super(SelfAssessmentTest, self).setUp('self_only')
 
     @retry()
+    @attr('acceptance')
     def test_self_assessment(self):
         # Submit a response
         self.auto_auth_page.visit()
@@ -115,6 +117,7 @@ class PeerAssessmentTest(OpenAssessmentTest):
         super(PeerAssessmentTest, self).setUp('peer_only')
 
     @retry()
+    @attr('acceptance')
     def test_peer_assessment(self):
         # Create a submission for the first student, so there's
         # at least one submission to assess.
@@ -150,6 +153,7 @@ class StudentTrainingTest(OpenAssessmentTest):
         super(StudentTrainingTest, self).setUp('student_training')
 
     @retry()
+    @attr('acceptance')
     def test_student_training(self):
         # Create a submission so we can get to student training
         self.auto_auth_page.visit()