Commit a13cc165 by Will Daly

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

Add phony target to Makefile for test and install
parents 8b07411a 33b9ee81
all: install test all: install test
.PHONY: install test
install-system: install-system:
sudo apt-get update -y -qq sudo apt-get update -y -qq
sudo xargs -a apt-packages.txt apt-get install -y -qq --fix-missing sudo xargs -a apt-packages.txt apt-get install -y -qq --fix-missing
install-node: install-node:
sudo add-apt-repository -y ppa:chris-lea/node.js sudo add-apt-repository -y ppa:chris-lea/node.js
sudo apt-get update -y -qq sudo apt-get update -y -qq
......
# Grab everything in base requirements
-r base.txt -r base.txt
-r test-acceptance.txt
ddt==0.8.0 ddt==0.8.0
django-nose==1.2 django-nose==1.2
......
...@@ -14,6 +14,7 @@ TEST_APPS = ( ...@@ -14,6 +14,7 @@ TEST_APPS = (
# Configure nose # Configure nose
NOSE_ARGS = [ NOSE_ARGS = [
"-a '!acceptance'",
'--with-coverage', '--with-coverage',
'--cover-package=' + ",".join(TEST_APPS), '--cover-package=' + ",".join(TEST_APPS),
'--cover-branches', '--cover-branches',
......
...@@ -22,6 +22,6 @@ To use the tests: ...@@ -22,6 +22,6 @@ To use the tests:
.. code:: bash .. code:: bash
cd edx-ora2/test/selenium cd edx-ora2/test/acceptance
export BASE_URL=https://{USER}:{PASSWORD}@example.com export BASE_URL=https://{USER}:{PASSWORD}@example.com
python tests.py python tests.py
...@@ -6,7 +6,6 @@ from bok_choy.promise import EmptyPromise ...@@ -6,7 +6,6 @@ from bok_choy.promise import EmptyPromise
import os import os
BASE_URL = os.environ.get('BASE_URL') 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): class PageConfigurationError(Exception):
......
...@@ -5,6 +5,7 @@ import os ...@@ -5,6 +5,7 @@ import os
import unittest import unittest
import time import time
from functools import wraps from functools import wraps
from nose.plugins.attrib import attr
from bok_choy.web_app_test import WebAppTest from bok_choy.web_app_test import WebAppTest
from bok_choy.promise import BrokenPromise from bok_choy.promise import BrokenPromise
from auto_auth import AutoAuthPage from auto_auth import AutoAuthPage
...@@ -86,6 +87,7 @@ class SelfAssessmentTest(OpenAssessmentTest): ...@@ -86,6 +87,7 @@ class SelfAssessmentTest(OpenAssessmentTest):
super(SelfAssessmentTest, self).setUp('self_only') super(SelfAssessmentTest, self).setUp('self_only')
@retry() @retry()
@attr('acceptance')
def test_self_assessment(self): def test_self_assessment(self):
# Submit a response # Submit a response
self.auto_auth_page.visit() self.auto_auth_page.visit()
...@@ -115,6 +117,7 @@ class PeerAssessmentTest(OpenAssessmentTest): ...@@ -115,6 +117,7 @@ class PeerAssessmentTest(OpenAssessmentTest):
super(PeerAssessmentTest, self).setUp('peer_only') super(PeerAssessmentTest, self).setUp('peer_only')
@retry() @retry()
@attr('acceptance')
def test_peer_assessment(self): def test_peer_assessment(self):
# Create a submission for the first student, so there's # Create a submission for the first student, so there's
# at least one submission to assess. # at least one submission to assess.
...@@ -150,6 +153,7 @@ class StudentTrainingTest(OpenAssessmentTest): ...@@ -150,6 +153,7 @@ class StudentTrainingTest(OpenAssessmentTest):
super(StudentTrainingTest, self).setUp('student_training') super(StudentTrainingTest, self).setUp('student_training')
@retry() @retry()
@attr('acceptance')
def test_student_training(self): def test_student_training(self):
# Create a submission so we can get to student training # Create a submission so we can get to student training
self.auto_auth_page.visit() self.auto_auth_page.visit()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment