| Message ID | 20191016190900.107501-2-aduskett@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v2,1/2] package/python-django: bump to version 2.2.6 | expand |
On Wed, 16 Oct 2019 12:09:00 -0700 aduskett@gmail.com wrote: > This test comprises of two simple steps: > 1: Start a new simple project called testsite. > 2: Run ./manage.py migrate on the new testsite. Don't we want to actually run the site in the local webserver, and connect to it ? > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 59efd51340..a840bcba0e 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -438,6 +438,7 @@ tests.package.test_python_constantly.TestPythonPy3Constantly: { extends: .runtim > tests.package.test_python_crossbar.TestPythonPy3Crossbar: { extends: .runtime_test } > tests.package.test_python_cryptography.TestPythonPy2Cryptography: { extends: .runtime_test } > tests.package.test_python_cryptography.TestPythonPy3Cryptography: { extends: .runtime_test } > +tests.package.test_python_django.TestPythonPy3Django: { extends: .runtime_test } > tests.package.test_python_incremental.TestPythonPy2Incremental: { extends: .runtime_test } > tests.package.test_python_incremental.TestPythonPy3Incremental: { extends: .runtime_test } > tests.package.test_python_passlib.TestPythonPy2Passlib: { extends: .runtime_test } > diff --git a/support/testing/tests/package/sample_python_django.py b/support/testing/tests/package/sample_python_django.py > new file mode 100644 > index 0000000000..c2bad566a7 > --- /dev/null > +++ b/support/testing/tests/package/sample_python_django.py > @@ -0,0 +1 @@ > +import django # noqa: F401 > diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py > new file mode 100644 > index 0000000000..6145d8be8f > --- /dev/null > +++ b/support/testing/tests/package/test_python_django.py > @@ -0,0 +1,26 @@ > +from tests.package.test_python import TestPythonPackageBase > + > + > +class TestPythonDjango(TestPythonPackageBase): > + config = TestPythonPackageBase.config > + sample_scripts = ["tests/package/sample_python_django.py"] > + > + def run_sample_scripts(self): Is this method really executed ? I thought only methods starting by test_<something>() were executed. Our current typical practice is to call the main test method test_run(). Thanks, Thomas
Hello, On Wed, Oct 16, 2019 at 04:28 PM, Thomas Petazzoni wrote: > On Wed, 16 Oct 2019 12:09:00 -0700 > aduskett@gmail.com wrote: > >> This test comprises of two simple steps: >> 1: Start a new simple project called testsite. >> 2: Run ./manage.py migrate on the new testsite. > > Don't we want to actually run the site in the local webserver, and > connect to it ? Certainly it would be better. The python-twisted test uses a mid-ground solution, by starting the server in background and checking with netstat that the server did opened the expected port. [snip] >> +++ b/support/testing/tests/package/test_python_django.py >> @@ -0,0 +1,26 @@ >> +from tests.package.test_python import TestPythonPackageBase >> + >> + >> +class TestPythonDjango(TestPythonPackageBase): >> + config = TestPythonPackageBase.config >> + sample_scripts = ["tests/package/sample_python_django.py"] >> + >> + def run_sample_scripts(self): > > Is this method really executed ? I thought only methods starting by > test_<something>() were executed. Our current typical practice is to > call the main test method test_run(). Yes. The test_run is declared in the parent class TestPythonPackageBase and it calls this method. The same (overriding run_sample_scripts) is already done in the python-twisted test. Regards, Ricardo
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59efd51340..a840bcba0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -438,6 +438,7 @@ tests.package.test_python_constantly.TestPythonPy3Constantly: { extends: .runtim tests.package.test_python_crossbar.TestPythonPy3Crossbar: { extends: .runtime_test } tests.package.test_python_cryptography.TestPythonPy2Cryptography: { extends: .runtime_test } tests.package.test_python_cryptography.TestPythonPy3Cryptography: { extends: .runtime_test } +tests.package.test_python_django.TestPythonPy3Django: { extends: .runtime_test } tests.package.test_python_incremental.TestPythonPy2Incremental: { extends: .runtime_test } tests.package.test_python_incremental.TestPythonPy3Incremental: { extends: .runtime_test } tests.package.test_python_passlib.TestPythonPy2Passlib: { extends: .runtime_test } diff --git a/support/testing/tests/package/sample_python_django.py b/support/testing/tests/package/sample_python_django.py new file mode 100644 index 0000000000..c2bad566a7 --- /dev/null +++ b/support/testing/tests/package/sample_python_django.py @@ -0,0 +1 @@ +import django # noqa: F401 diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py new file mode 100644 index 0000000000..6145d8be8f --- /dev/null +++ b/support/testing/tests/package/test_python_django.py @@ -0,0 +1,26 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonDjango(TestPythonPackageBase): + config = TestPythonPackageBase.config + sample_scripts = ["tests/package/sample_python_django.py"] + + def run_sample_scripts(self): + cmd = "cd /opt && /usr/bin/django-admin startproject testsite" + _, exit_code = self.emulator.run(cmd, timeout=30) + self.assertEqual(exit_code, 0) + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py migrate" + output, exit_code = self.emulator.run(cmd, timeout=30) + self.assertIn("Operations to perform:", output[0]) + self.assertEqual(exit_code, 0) + + +class TestPythonPy3Django(TestPythonDjango): + __test__ = True + config = TestPythonDjango.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DJANGO=y + BR2_PACKAGE_PYTHON_SQLPARSE=y + BR2_PACKAGE_PYTHON3_SQLITE=y + """