Commit 15d24c7f by Bodor Máté

Merge branch 'fix-ci' into 'DEV'

Fix ci

See merge request !13
parents b50c79c7 cdf7bf74
Pipeline #797 passed with stage
in 1 minute 22 seconds
image: python:3.6 image: python:3.6
stages:
- lint
- test
before_script: before_script:
- pip install pipenv
- pipenv install -d
- git submodule sync --recursive - git submodule sync --recursive
- git submodule update --init --recursive - git submodule update --init --recursive
flake8: flake8:
stage: lint
script: script:
- pipenv run flake8 - pip install flake8
- flake8
test: test:
script: script:
- pip install pipenv
- pipenv install -d
- cd recircle - cd recircle
- pipenv run python manage.py test - pipenv run python manage.py test
...@@ -8,6 +8,7 @@ httpie = "*" ...@@ -8,6 +8,7 @@ httpie = "*"
flake8 = "*" flake8 = "*"
django-rest-swagger = "*" django-rest-swagger = "*"
coverage = "*" coverage = "*"
django-nose = "*"
[packages] [packages]
django = "*" django = "*"
......
# from django.test import TestCase from django.test import TestCase
# Create your tests here.
class ImageTest(TestCase):
def test_test(self):
self.assertEqual("", "")
# Generated by Django 2.2.3 on 2019-07-31 12:15
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('instance', '0009_auto_20190715_0929'),
('instance', '0009_auto_20190715_1354'),
]
operations = [
]
# from django.test import TestCase from django.test import TestCase
# Create your tests here.
class InstanceTest(TestCase):
def test_test(self):
self.assertEqual("", "")
Subproject commit abe7a47367d285b98066243cf1f0e9c5454955d2 Subproject commit e01d873c78ac17fed0438936f979de3cbaca6a5e
...@@ -41,6 +41,7 @@ INSTALLED_APPS = [ ...@@ -41,6 +41,7 @@ INSTALLED_APPS = [
"djoser", "djoser",
"rest_framework_swagger", "rest_framework_swagger",
"corsheaders", "corsheaders",
"django_nose",
] ]
LOCAL_APPS = [ LOCAL_APPS = [
......
...@@ -11,3 +11,6 @@ for i in LOCAL_APPS: ...@@ -11,3 +11,6 @@ for i in LOCAL_APPS:
ADMIN_ENABLED = True ADMIN_ENABLED = True
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']
TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
NOSE_ARGS = LOCAL_APPS
\ No newline at end of file
# from django.test import TestCase from django.test import TestCase
# Create your tests here.
class StorageTest(TestCase):
def test_test(self):
self.assertEqual("", "")
# from django.test import TestCase from django.test import TestCase
# Create your tests here.
class TemplateTest(TestCase):
def test_test(self):
self.assertEqual("", "")
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 sign in to comment