diff options
| author | Rob Austein <sra@hactrn.net> | 2015-10-26 20:31:13 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-10-26 20:31:13 +0000 |
| commit | e1d631df7838515e44edf5a38ff6362451da1340 (patch) | |
| tree | 9f1a11905d9ef52d988b999cc085247c22c4c713 /ca | |
| parent | b46deb1417dc3596e9ac9fe2fe8cc0b7f42457e7 (diff) | |
Whack a few things stale imports and Django 1.6-isms to get GUI
running with new code base. Now working with
$ yamltest.py --sql mysql --gui smoketest.1.yaml
svn path=/branches/tk705/; revision=6153
Diffstat (limited to 'ca')
| -rwxr-xr-x[-rw-r--r--] | ca/tests/yamltest.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ca/tests/yamltest.py b/ca/tests/yamltest.py index f82cc192..ae87f949 100644..100755 --- a/ca/tests/yamltest.py +++ b/ca/tests/yamltest.py @@ -689,6 +689,7 @@ class allocation(object): cmd = (prog_rpki_manage, "runserver", str(port)) env = dict(os.environ, RPKI_CONF = self.path("rpki.conf"), + DJANGO_SETTINGS_MODULE = "rpki.django_settings.gui", RPKI_DJANGO_DEBUG = "yes", ALLOW_PLAIN_HTTP_FOR_TESTING = "I solemnly swear that I am not running this in production") p = subprocess.Popen(cmd, cwd = self.path(), env = env, @@ -756,10 +757,10 @@ parser.add_argument("--synchronize", action = "store_true", help = "synchronize IRDB with daemons") parser.add_argument("--profile", action = "store_true", help = "enable profiling") -parser.add_argument("-g", "--run_gui", action = "store_true", +parser.add_argument("-g", "--run_gui", "--gui", action = "store_true", help = "enable GUI using django-admin runserver") -parser.add_argument("--browser", action = "store_true", - help = "create web browser tabs for GUI") +parser.add_argument("--no-browser", action = "store_true", + help = "don't create web browser tabs for GUI") parser.add_argument("--notify-when-startup-complete", type = int, help = "send SIGUSR1 to this process when startup is complete") parser.add_argument("--store-router-private-keys", action = "store_true", @@ -950,7 +951,7 @@ try: if not d.is_hosted: url = "http://127.0.0.1:%d/rpki/" % (8000 + d.engine) print "GUI URL", url, "for", d.name - if args.browser: + if not args.no_browser: if d is db.root: webbrowser.open_new(url) else: |