Set KOLIBRI_LISTEN_PORT default to 8080 and use it in cli.start() #1729

benjaoming · 2017-06-26T14:15:26Z

Summary

FIxes #1724

TODO

Have tests been written for the new code?
Has documentation been written/updated?
New dependencies (if any) added to requirements file
Add an entry to CHANGELOG.rst
Add yourself it AUTHORS.rst if you don't appear there

Issues addressed

#1724

Documentation

Looking through docs to see if there's any changes to be made...

codecov-io · 2017-06-26T14:50:35Z

Codecov Report

Merging #1729 into release-v0.5.x will increase coverage by 0.1%.
The diff coverage is 53.84%.

@@                Coverage Diff                @@
##           release-v0.5.x    #1729     +/-   ##
=================================================
+ Coverage           73.73%   73.83%   +0.1%     
=================================================
  Files                 152      152             
  Lines                5516     5522      +6     
  Branches              650      654      +4     
=================================================
+ Hits                 4067     4077     +10     
+ Misses               1337     1334      -3     
+ Partials              112      111      -1

Impacted Files	Coverage Δ
kolibri/deployment/default/settings/base.py	`100% <ø> (ø)`	⬆️
...libri/deployment/default/settings/postgres_test.py	`100% <ø> (ø)`	⬆️
kolibri/core/webpack/test/base.py	`100% <100%> (ø)`	⬆️
kolibri/utils/server.py	`43.33% <20%> (+1.31%)`	⬆️
kolibri/utils/cli.py	`66.51% <69.23%> (+1.99%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d97ecd6...31a56a8. Read the comment docs.

eduard-buildbot · 2017-06-26T14:59:46Z

Build Artifacts

Kolibri Installers
Windows Installer: KolibriSetup-0.4.0.dev386.exe

Python packages
Pex: kolibri-v0.4.0-386-g3f4ebfe.pex
Whl file: kolibri-0.4.0.dev386-py2.py3-none-any.whl
Zip file: kolibri-0.4.0.dev386.zip
Tar file: kolibri-0.4.0.dev386.tar.gz

eduard-buildbot · 2017-06-26T15:57:39Z

Build Artifacts

Kolibri Installers
Windows Installer: KolibriSetup-0.4.0.dev387.exe

Python packages
Pex: kolibri-v0.4.0-387-g43cb4c2.pex
Whl file: kolibri-0.4.0.dev387-py2.py3-none-any.whl
Zip file: kolibri-0.4.0.dev387.zip
Tar file: kolibri-0.4.0.dev387.tar.gz

benjaoming · 2017-06-26T15:57:50Z

Looking into a few things to understand the loss of test coverage, added a more deliberate test of update_channel_metadata_cache although it doesn't actually check that data is correctly annotated :/ I'm not sure if that sort of coverage is super nice, but alternatively, I'd suggest to open an issue about it.

eduard-buildbot · 2017-06-26T16:26:10Z

Build Artifacts

Kolibri Installers
Windows Installer: KolibriSetup-0.4.0.dev387.exe

Python packages
Pex: kolibri-v0.4.0-387-g399660c.pex
Whl file: kolibri-0.4.0.dev387-py2.py3-none-any.whl
Zip file: kolibri-0.4.0.dev387.zip
Tar file: kolibri-0.4.0.dev387.tar.gz

rtibbles

Looks good, just need to resolve merge conflict on the CHANGELOG.

eduard-buildbot · 2017-06-28T21:44:17Z

Build Artifacts

Kolibri Installers
Windows Installer: KolibriSetup-0.4.0.dev443.exe

Python packages
Pex: kolibri-v0.4.0-443-g47bbff7.pex
Whl file: kolibri-0.4.0.dev443-py2.py3-none-any.whl
Zip file: kolibri-0.4.0.dev443.zip
Tar file: kolibri-0.4.0.dev443.tar.gz

rtibbles · 2017-06-28T22:41:53Z

And another merge conflict resolved!

rtibbles · 2017-06-29T00:07:31Z

Except I broke everything. Sadness :(

eduard-buildbot · 2017-06-29T00:20:09Z

Build Artifacts

Kolibri Installers
Windows Installer: KolibriSetup-0.4.0.dev450.exe

Python packages
Pex: kolibri-v0.4.0-450-ge7fe035.pex
Whl file: kolibri-0.4.0.dev450-py2.py3-none-any.whl
Zip file: kolibri-0.4.0.dev450.zip
Tar file: kolibri-0.4.0.dev450.tar.gz

eduard-buildbot · 2017-06-29T03:10:35Z

Build Artifacts

Kolibri Installers
Windows Installer: KolibriSetup-0.4.0.dev451.exe

Python packages
Pex: kolibri-v0.4.0-451-gaf15a91.pex
Whl file: kolibri-0.4.0.dev451-py2.py3-none-any.whl
Zip file: kolibri-0.4.0.dev451.zip
Tar file: kolibri-0.4.0.dev451.tar.gz

benjaoming · 2017-06-29T19:01:58Z

Working on it now!

eduard-buildbot · 2017-06-29T19:18:41Z

Build Artifacts

Kolibri Installers
Windows Installer: KolibriSetup-0.4.0.dev452.exe

Python packages
Pex: kolibri-v0.4.0-452-g6c77cd8.pex
Whl file: kolibri-0.4.0.dev452-py2.py3-none-any.whl
Zip file: kolibri-0.4.0.dev452.zip
Tar file: kolibri-0.4.0.dev452.tar.gz

benjaoming · 2017-06-30T00:04:53Z

Some strange stuff going on with the postgres tests:

kolibri/utils/tests/test_cli.py:73: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
kolibri/utils/cli.py:237: in start
    update()
kolibri/utils/cli.py:211: in update
    call_command("migrate", interactive=False, database="ormq")
.tox/postgres/lib/python2.7/site-packages/django/core/management/__init__.py:119: in call_command
    return command.execute(*args, **defaults)
.tox/postgres/lib/python2.7/site-packages/django/core/management/base.py:399: in execute
    output = self.handle(*args, **options)
.tox/postgres/lib/python2.7/site-packages/django/core/management/commands/migrate.py:66: in handle
    connection = connections[db]
.tox/postgres/lib/python2.7/site-packages/django/db/utils.py:209: in __getitem__
    self.ensure_defaults(alias)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
self = <django.db.utils.ConnectionHandler object at 0x7fa9760f3050>
alias = 'ormq'
    def ensure_defaults(self, alias):
        """
            Puts the defaults into the settings dictionary for a given connection
            where no settings is provided.
            """
        try:
            conn = self.databases[alias]
        except KeyError:
>           raise ConnectionDoesNotExist("The connection %s doesn't exist" % alias)
E           ConnectionDoesNotExist: The connection ormq doesn't exist

benjaoming · 2017-07-06T22:06:12Z

Rebased and force-pushed. Please have patience.. will figure out what's up with the postgres test.

…rningequality#1724

…arningequality#1629

…iTestBase

benjaoming · 2017-07-17T20:28:39Z

Rebased to upstream to resolve conflicts, seems ready! @rtibbles

…t_cli

benjaoming · 2017-07-17T21:03:04Z

Seemed to still fail in the postgres tests (kolibri/core/webpack/test/test_webpack_tags.py::TestHook: cannot collect test class 'TestHook' because it has a __init__ constructor), so I changed some things

Ref of build fail: https://travis-ci.org/learningequality/kolibri/jobs/254600284

kolibri/utils/server.py

@@ -61,6 +61,12 @@ def start(port=8080):
    with open(PID_FILE, 'w') as f:
        f.write("%d\n%d" % (os.getpid(), port))

+    # TODO: not sure where it should ideally be located. Question is if it
+    # should be run every time the server is started or if it depends on some
+    # kind of state change.


benjaoming · 2017-07-24T14:07:48Z

Notice that I actually improved test coverage even though in an area where it was already very low :)

benjaoming · 2017-07-24T14:09:54Z

@jamalex @rtibbles please merge at will, I have nothing more to add here, will pick up on test coverage as #1595 is implemented.

benjaoming · 2017-07-24T14:10:27Z

The PR also removes creation of a legacy ormq database which belonged to django-q.

benjaoming added this to the 0.5.0 milestone Jun 26, 2017

benjaoming requested a review from jamalex June 26, 2017 14:15

learningequality deleted a comment from eduard-buildbot Jun 26, 2017

benjaoming force-pushed the bug/port-env-setting branch from 43cb4c2 to 399660c Compare June 26, 2017 16:16

benjaoming changed the base branch from develop to release-v0.5.x June 27, 2017 13:05

rtibbles approved these changes Jun 27, 2017

View reviewed changes

benjaoming force-pushed the bug/port-env-setting branch from 6c77cd8 to 277347d Compare July 6, 2017 22:04

benjaoming added 4 commits July 17, 2017 22:27

Set KOLIBRI_LISTEN_PORT default to 8080 and use it in cli.start() lea…

990e73e

…rningequality#1724

Changelog for learningequality#1724 [ci skip]

c9df722

Add test for KOLIBRI_LISTEN_PORT and some start/stop functionality le…

32e2429

…arningequality#1629

Add a test for update_channel_metadata_cache, remove confusing Kolibr…

cd24952

…iTestBase

benjaoming force-pushed the bug/port-env-setting branch from 277347d to 8f09f11 Compare July 17, 2017 20:28

New concurrency in tests requires allowing db access for stuff in tes…

408037b

…t_cli

benjaoming force-pushed the bug/port-env-setting branch from 8f09f11 to 408037b Compare July 17, 2017 21:01

jamalex reviewed Jul 17, 2017

View reviewed changes

Remove TODO re: @jamalex' comment

90be592

benjaoming force-pushed the bug/port-env-setting branch from 37e74f3 to 2ed42cf Compare July 24, 2017 12:49

Remove django-q remnants, now making postgres tests fail @aronasorman

31a56a8

benjaoming force-pushed the bug/port-env-setting branch from 2ed42cf to 31a56a8 Compare July 24, 2017 13:12

rtibbles merged commit 2a66512 into learningequality:release-v0.5.x Jul 24, 2017

rtibbles mentioned this pull request Jul 24, 2017

KOLIBRI_LISTEN_PORT doesn't seem to get used #1724

Closed

benjaoming deleted the bug/port-env-setting branch August 1, 2017 13:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Set KOLIBRI_LISTEN_PORT default to 8080 and use it in cli.start() #1729

Set KOLIBRI_LISTEN_PORT default to 8080 and use it in cli.start() #1729

benjaoming commented Jun 26, 2017 •

edited

Loading

codecov-io commented Jun 26, 2017 •

edited

Loading

eduard-buildbot commented Jun 26, 2017

eduard-buildbot commented Jun 26, 2017

benjaoming commented Jun 26, 2017 •

edited

Loading

eduard-buildbot commented Jun 26, 2017

rtibbles left a comment

eduard-buildbot commented Jun 28, 2017

rtibbles commented Jun 28, 2017

rtibbles commented Jun 29, 2017

eduard-buildbot commented Jun 29, 2017

eduard-buildbot commented Jun 29, 2017

benjaoming commented Jun 29, 2017

eduard-buildbot commented Jun 29, 2017

benjaoming commented Jun 30, 2017

benjaoming commented Jul 6, 2017

benjaoming commented Jul 17, 2017

benjaoming commented Jul 17, 2017 •

edited

Loading

This comment was marked as spam.

This comment was marked as spam.

benjaoming commented Jul 24, 2017

benjaoming commented Jul 24, 2017

benjaoming commented Jul 24, 2017

Set KOLIBRI_LISTEN_PORT default to 8080 and use it in cli.start() #1729

Set KOLIBRI_LISTEN_PORT default to 8080 and use it in cli.start() #1729

Conversation

benjaoming commented Jun 26, 2017 • edited Loading

Summary

TODO

Issues addressed

Documentation

codecov-io commented Jun 26, 2017 • edited Loading

Codecov Report

eduard-buildbot commented Jun 26, 2017

Build Artifacts

eduard-buildbot commented Jun 26, 2017

Build Artifacts

benjaoming commented Jun 26, 2017 • edited Loading

eduard-buildbot commented Jun 26, 2017

Build Artifacts

rtibbles left a comment

Choose a reason for hiding this comment

eduard-buildbot commented Jun 28, 2017

Build Artifacts

rtibbles commented Jun 28, 2017

rtibbles commented Jun 29, 2017

eduard-buildbot commented Jun 29, 2017

Build Artifacts

eduard-buildbot commented Jun 29, 2017

Build Artifacts

benjaoming commented Jun 29, 2017

eduard-buildbot commented Jun 29, 2017

Build Artifacts

benjaoming commented Jun 30, 2017

benjaoming commented Jul 6, 2017

benjaoming commented Jul 17, 2017

benjaoming commented Jul 17, 2017 • edited Loading

This comment was marked as spam.

This comment was marked as spam.

benjaoming commented Jul 24, 2017

benjaoming commented Jul 24, 2017

benjaoming commented Jul 24, 2017

benjaoming commented Jun 26, 2017 •

edited

Loading

codecov-io commented Jun 26, 2017 •

edited

Loading

benjaoming commented Jun 26, 2017 •

edited

Loading

benjaoming commented Jul 17, 2017 •

edited

Loading