Fix issue with travis build

tangentlabs · Dec 18, 2013 · e4e8f5c · e4e8f5c
1 parent edd75f5
commit e4e8f5c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,6 @@ install:
   - pip install . --use-mirrors --use-wheel
   - pip install -r requirements.txt --use-mirrors --use-wheel
 script:
-  - make test
+  - make travis
 after_success:
   - coveralls
diff --git a/Makefile b/Makefile
@@ -10,8 +10,17 @@ compile-static:
 	lessc ${STATIC_DIR}less/assets.less > ${STATIC_DIR}css/assets.css
 	lessc ${STATIC_DIR}less/page.less > ${STATIC_DIR}css/page.css
 
-test:
+test: test-fancypages test-oscar-fancypages
+
+travis:
+	${MAKE} test-fancypages
+	pip install -r requirements_oscar.txt
+	${MAKE} test-oscar-fancypages
+
+test-fancypages:
 	py.test --pep8
-	USE_OSCAR_SANDBOX=true py.test --pep8 --cov fancypages
 	py.test -m integration
+
+test-oscar-fancypages:
+	USE_OSCAR_SANDBOX=true py.test --pep8 --cov fancypages
 	USE_OSCAR_SANDBOX=true py.test -m integration