Skip to content

RECIRCLE / portal

Go to a project
Commit 15d24c7f by Bodor Máté
Options

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
Showing with 113 additions and 68 deletions
.gitlab-ci.yml
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
Pipfile
...@@ -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 = "*"
......
Pipfile.lock
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "f991f85fb7c006559ee78cb35cc3a18089dfd0065a565f2b194c197cbf772a50" "sha256": "8cb2efb1cfa79de96297c90953faf757011ca1f1ff4784ac05226a249001e1f5"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
...@@ -144,19 +144,19 @@ ...@@ -144,19 +144,19 @@
}, },
"djangorestframework": { "djangorestframework": {
"hashes": [ "hashes": [
"sha256:1ca4a5599a5ec31f3d6238a687fcc1dd4c41b1d90edab9ad398fcbf87872b7ba", "sha256:42979bd5441bb4d8fd69d0f385024a114c3cae7df0f110600b718751250f6929",
"sha256:c3c5edfdbc5dd33f9121bb84305bfd603d2c791f20cff9782772f44a7684a4e4" "sha256:aedb48010ebfab9651aaab1df5fd3b4848eb4182afc909852a2110c24f89a359"
], ],
"index": "pypi", "index": "pypi",
"version": "==3.10.1" "version": "==3.10.2"
}, },
"djoser": { "djoser": {
"hashes": [ "hashes": [
"sha256:1e310801b225ea668a035d3da90c1c9ca5b80a294235b9a25a5999fbc9ac5a96", "sha256:3c4112f50c29f7f9811688bedf440ccd1490abb44c5969cc8cfcf6c4d183cd26",
"sha256:d0ca48a05f590d77d6d292177c735a92b639f78a7060c1861d9b5317843a0685" "sha256:b2586f8a45bec04083d90bbfc255d21af9dcd5f45c79ce911e28aa78a4939f17"
], ],
"index": "pypi", "index": "pypi",
"version": "==1.7.0" "version": "==2.0.1"
}, },
"dogpile.cache": { "dogpile.cache": {
"hashes": [ "hashes": [
...@@ -188,10 +188,10 @@ ...@@ -188,10 +188,10 @@
}, },
"jsonpatch": { "jsonpatch": {
"hashes": [ "hashes": [
"sha256:49f29cab70e9068db3b1dc6b656cbe2ee4edf7dfe9bf5a0055f17a4b6804a4b9", "sha256:83f29a2978c13da29bfdf89da9d65542d62576479caf215df19632d7dc04c6e6",
"sha256:8bf92fa26bc42c346c03bd4517722a8e4f429225dbe775ac774b2c70d95dbd33" "sha256:cbb72f8bf35260628aea6b508a107245f757d1ec839a19c34349985e2c05645a"
], ],
"version": "==1.23" "version": "==1.24"
}, },
"jsonpointer": { "jsonpointer": {
"hashes": [ "hashes": [
...@@ -272,11 +272,11 @@ ...@@ -272,11 +272,11 @@
}, },
"openstacksdk": { "openstacksdk": {
"hashes": [ "hashes": [
"sha256:44a726ff8969072f766e178becff2d3933a8ea084e4cc2516c56b8ade80e4af9", "sha256:dc1232a58e30876ed6b28ee7bf5fee281b70048b187e88acd8a53cc3b63f9d8a",
"sha256:8d0607d08ac1d206040730dbbac5bb1a535e855616b11ad303847c5061f1f5ee" "sha256:f6e045d2e0a111d3a8dd157d111a04f1354ad6cc7819f6c1db073426bea7734f"
], ],
"index": "pypi", "index": "pypi",
"version": "==0.31.1" "version": "==0.31.2"
}, },
"os-service-types": { "os-service-types": {
"hashes": [ "hashes": [
...@@ -329,10 +329,10 @@ ...@@ -329,10 +329,10 @@
}, },
"pyparsing": { "pyparsing": {
"hashes": [ "hashes": [
"sha256:530d8bf8cc93a34019d08142593cf4d78a05c890da8cf87ffa3120af53772238", "sha256:6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80",
"sha256:f78e99616b6f1a4745c0580e170251ef1bbafc0d0513e270c4bd281bf29d2800" "sha256:d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4"
], ],
"version": "==2.4.1" "version": "==2.4.2"
}, },
"python-novaclient": { "python-novaclient": {
"hashes": [ "hashes": [
...@@ -462,40 +462,49 @@ ...@@ -462,40 +462,49 @@
}, },
"coverage": { "coverage": {
"hashes": [ "hashes": [
"sha256:3684fabf6b87a369017756b551cef29e505cb155ddb892a7a29277b978da88b9", "sha256:08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6",
"sha256:39e088da9b284f1bd17c750ac672103779f7954ce6125fd4382134ac8d152d74", "sha256:0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650",
"sha256:3c205bc11cc4fcc57b761c2da73b9b72a59f8d5ca89979afb0c1c6f9e53c7390", "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5",
"sha256:465ce53a8c0f3a7950dfb836438442f833cf6663d407f37d8c52fe7b6e56d7e8", "sha256:19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d",
"sha256:48020e343fc40f72a442c8a1334284620f81295256a6b6ca6d8aa1350c763bbe", "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351",
"sha256:5296fc86ab612ec12394565c500b412a43b328b3907c0d14358950d06fd83baf", "sha256:245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755",
"sha256:5f61bed2f7d9b6a9ab935150a6b23d7f84b8055524e7be7715b6513f3328138e", "sha256:331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef",
"sha256:68a43a9f9f83693ce0414d17e019daee7ab3f7113a70c79a3dd4c2f704e4d741", "sha256:386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca",
"sha256:6b8033d47fe22506856fe450470ccb1d8ba1ffb8463494a15cfc96392a288c09", "sha256:3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca",
"sha256:7ad7536066b28863e5835e8cfeaa794b7fe352d99a8cded9f43d1161be8e9fbd", "sha256:60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9",
"sha256:7bacb89ccf4bedb30b277e96e4cc68cd1369ca6841bde7b005191b54d3dd1034", "sha256:63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc",
"sha256:839dc7c36501254e14331bcb98b27002aa415e4af7ea039d9009409b9d2d5420", "sha256:6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5",
"sha256:8f9a95b66969cdea53ec992ecea5406c5bd99c9221f539bca1e8406b200ae98c", "sha256:6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f",
"sha256:932c03d2d565f75961ba1d3cec41ddde00e162c5b46d03f7423edcb807734eab", "sha256:7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe",
"sha256:988529edadc49039d205e0aa6ce049c5ccda4acb2d6c3c5c550c17e8c02c05ba", "sha256:826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888",
"sha256:998d7e73548fe395eeb294495a04d38942edb66d1fa61eb70418871bc621227e", "sha256:93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5",
"sha256:9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609", "sha256:9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce",
"sha256:9e80d45d0c7fcee54e22771db7f1b0b126fb4a6c0a2e5afa72f66827207ff2f2", "sha256:af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5",
"sha256:a545a3dfe5082dc8e8c3eb7f8a2cf4f2870902ff1860bd99b6198cfd1f9d1f49", "sha256:bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e",
"sha256:a5d8f29e5ec661143621a8f4de51adfb300d7a476224156a39a392254f70687b", "sha256:bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e",
"sha256:aca06bfba4759bbdb09bf52ebb15ae20268ee1f6747417837926fae990ebc41d", "sha256:c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9",
"sha256:bb23b7a6fd666e551a3094ab896a57809e010059540ad20acbeec03a154224ce", "sha256:dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437",
"sha256:bfd1d0ae7e292105f29d7deaa9d8f2916ed8553ab9d5f39ec65bcf5deadff3f9", "sha256:df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1",
"sha256:c62ca0a38958f541a73cf86acdab020c2091631c137bd359c4f5bddde7b75fd4", "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c",
"sha256:c709d8bda72cf4cd348ccec2a4881f2c5848fd72903c185f363d361b2737f773", "sha256:e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24",
"sha256:c968a6aa7e0b56ecbd28531ddf439c2ec103610d3e2bf3b75b813304f8cb7723", "sha256:e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47",
"sha256:df785d8cb80539d0b55fd47183264b7002077859028dfe3070cf6359bf8b2d9c", "sha256:eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2",
"sha256:f406628ca51e0ae90ae76ea8398677a921b36f0bd71aab2099dfed08abd0322f", "sha256:eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28",
"sha256:f46087bbd95ebae244a0eda01a618aff11ec7a069b15a3ef8f6b520db523dcf1", "sha256:ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c",
"sha256:f8019c5279eb32360ca03e9fac40a12667715546eed5c5eb59eb381f2f501260", "sha256:efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7",
"sha256:fc5f4d209733750afd2714e9109816a29500718b32dd9a5db01c0cb3a019b96a" "sha256:fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0",
"sha256:ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025"
], ],
"index": "pypi", "index": "pypi",
"version": "==4.5.3" "version": "==4.5.4"
},
"django-nose": {
"hashes": [
"sha256:58934a06a6932696e54c9e8af3fab49bf67ca9e9c840ad668cb7f51219808a07",
"sha256:f515d903cfaeda52c7a9198e0c8ed51563e82802b62a4e5fbd056fd830095318"
],
"index": "pypi",
"version": "==1.4.6"
}, },
"django-rest-swagger": { "django-rest-swagger": {
"hashes": [ "hashes": [
...@@ -507,11 +516,11 @@ ...@@ -507,11 +516,11 @@
}, },
"djangorestframework": { "djangorestframework": {
"hashes": [ "hashes": [
"sha256:1ca4a5599a5ec31f3d6238a687fcc1dd4c41b1d90edab9ad398fcbf87872b7ba", "sha256:42979bd5441bb4d8fd69d0f385024a114c3cae7df0f110600b718751250f6929",
"sha256:c3c5edfdbc5dd33f9121bb84305bfd603d2c791f20cff9782772f44a7684a4e4" "sha256:aedb48010ebfab9651aaab1df5fd3b4848eb4182afc909852a2110c24f89a359"
], ],
"index": "pypi", "index": "pypi",
"version": "==3.10.1" "version": "==3.10.2"
}, },
"entrypoints": { "entrypoints": {
"hashes": [ "hashes": [
...@@ -596,6 +605,14 @@ ...@@ -596,6 +605,14 @@
], ],
"version": "==0.6.1" "version": "==0.6.1"
}, },
"nose": {
"hashes": [
"sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac",
"sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a",
"sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"
],
"version": "==1.3.7"
},
"openapi-codec": { "openapi-codec": {
"hashes": [ "hashes": [
"sha256:1bce63289edf53c601ea3683120641407ff6b708803b8954c8a876fe778d2145" "sha256:1bce63289edf53c601ea3683120641407ff6b708803b8954c8a876fe778d2145"
......
recircle/image/tests.py
# from django.test import TestCase from django.test import TestCase
# Create your tests here.
class ImageTest(TestCase):
def test_test(self):
self.assertEqual("", "")
recircle/instance/migrations/0010_merge_20190731_1215.py 0 → 100644
# 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 = [
]
recircle/instance/tests.py
# from django.test import TestCase from django.test import TestCase
# Create your tests here.
class InstanceTest(TestCase):
def test_test(self):
self.assertEqual("", "")
interface_openstack @ e01d873c
Subproject commit abe7a47367d285b98066243cf1f0e9c5454955d2 Subproject commit e01d873c78ac17fed0438936f979de3cbaca6a5e
recircle/recircle/settings/base.py
...@@ -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 = [
......
recircle/recircle/settings/local.py
...@@ -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
recircle/storage/tests.py
# from django.test import TestCase from django.test import TestCase
# Create your tests here.
class StorageTest(TestCase):
def test_test(self):
self.assertEqual("", "")
recircle/template/tests.py
# 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